From 5cd47b2c18c540fc9d5614aeb417f3dca94b6a6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 Mar 2013 00:26:26 +0100 Subject: [PATCH] haskell-pandoc: update to version 1.11 --- .../libraries/haskell/pandoc/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 93f7e8add42..184e3fd9536 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,13 +1,15 @@ -{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs -, dataDefault, extensibleExceptions, filepath, highlightingKate -, HTTP, json, mtl, network, pandocTypes, parsec, random, syb -, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib +{ cabal, ansiTerminal, base64Bytestring, blazeHtml, blazeMarkup +, citeprocHs, dataDefault, Diff, extensibleExceptions, filepath +, highlightingKate, HTTP, HUnit, json, mtl, network, pandocTypes +, parsec, QuickCheck, random, syb, tagsoup, temporary +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, texmath, text, time, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.10.1"; - sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y"; + version = "1.11"; + sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,10 +18,13 @@ cabal.mkDerivation (self: { network pandocTypes parsec random syb tagsoup temporary texmath text time xml zipArchive zlib ]; + testDepends = [ + ansiTerminal Diff filepath highlightingKate HUnit pandocTypes + QuickCheck syb testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; configureFlags = "-fblaze_html_0_5"; - patchPhase = '' - sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal - ''; + patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal"; doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc";