diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 480a90b7135..de998c51b93 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,19 +1,23 @@ -{ cabal, base64Bytestring, blazeHtml, citeprocHs -, extensibleExceptions, highlightingKate, HTTP, json, mtl, network -, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath -, time, utf8String, xml, zipArchive, zlib +{ cabal, ansiTerminal, base64Bytestring, blazeHtml, citeprocHs +, Diff, extensibleExceptions, highlightingKate, HTTP, HUnit, json +, mtl, network, pandocTypes, parsec, QuickCheck, random, syb +, tagsoup, temporary, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, texmath, time, utf8String, xml +, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.0.2"; - sha256 = "0p1haqya99r52k6c07zq89ifdjs1r5g1y44011114pwsxwkmv43f"; + version = "1.9.0.3"; + sha256 = "1p5054sdvvgl38rr0ajfavr79rwr2l8jdrpzai329ksskkh1acdp"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml citeprocHs extensibleExceptions - highlightingKate HTTP json mtl network pandocTypes parsec random - syb tagsoup temporary texmath time utf8String xml zipArchive zlib + ansiTerminal base64Bytestring blazeHtml citeprocHs Diff + extensibleExceptions highlightingKate HTTP HUnit json mtl network + pandocTypes parsec QuickCheck random syb tagsoup temporary + testFramework testFrameworkHunit testFrameworkQuickcheck2 texmath + time utf8String xml zipArchive zlib ]; configureFlags = "-fhighlighting -fthreaded"; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 30539d748c4..f29eaeca9e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1061,7 +1061,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; pathPieces = self.pathPieces_0_1_0; - pandoc = callPackage ../development/libraries/haskell/pandoc {}; + pandoc = callPackage ../development/libraries/haskell/pandoc { + testFramework = self.testFramework_0_4_2_2; + }; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};