haskell-hakyll: patch build to succeed with latest version of pandoc

This commit is contained in:
Peter Simons 2013-09-18 17:48:19 +02:00
parent dc4e44a241
commit 10e74cdee3

View File

@ -1,9 +1,9 @@
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs { cabal, binary, blazeHtml, blazeMarkup, pandocCiteproc, cmdargs
, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit , cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit
, httpTypes, HUnit, lrucache, mtl, network, pandoc, parsec , httpTypes, HUnit, lrucache, mtl, network, pandoc, parsec
, QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer
, systemFilepath, tagsoup, testFramework, testFrameworkHunit , systemFilepath, tagsoup, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, text, time , testFrameworkQuickcheck2, text, time, fetchurl
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -12,22 +12,26 @@ cabal.mkDerivation (self: {
sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n"; sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
patches = [ (fetchurl { url = "https://github.com/jaspervdj/hakyll/pull/183.patch";
sha256 = "0vjrxvgyc05nnshapjhk65pcamj9rigqff5q6wjbssx3ggqggrz9";
name = "hakyll-pandoc-fix.patch";
}) ];
buildDepends = [ buildDepends = [
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash
dataDefault deepseq filepath fsnotify httpConduit httpTypes dataDefault deepseq filepath fsnotify httpConduit httpTypes
lrucache mtl network pandoc parsec random regexBase regexTdfa lrucache mtl network pandoc parsec random regexBase regexTdfa
snapCore snapServer systemFilepath tagsoup text time snapCore snapServer systemFilepath tagsoup text time
]; ];
testDepends = [ testDepends = [
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash
dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit
lrucache mtl network pandoc parsec QuickCheck random regexBase lrucache mtl network pandoc parsec QuickCheck random regexBase
regexTdfa snapCore snapServer systemFilepath tagsoup testFramework regexTdfa snapCore snapServer systemFilepath tagsoup testFramework
testFrameworkHunit testFrameworkQuickcheck2 text time testFrameworkHunit testFrameworkQuickcheck2 text time
]; ];
doCheck = false; doCheck = false;
patchPhase = '' postPatch = ''
sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' -e 's|pandoc.*,|pandoc,|' hakyll.cabal sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal
''; '';
meta = { meta = {
homepage = "http://jaspervdj.be/hakyll"; homepage = "http://jaspervdj.be/hakyll";