diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 6c30ca18b883..d4bf86fc2776 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,32 +1,24 @@ -{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed -, filepath, filestore, ghcPaths, happstackServer, highlightingKate -, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc -, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup -, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchpatch +{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath +, filestore, ghcPaths, happstackServer, highlightingKate, hslogger +, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes +, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text +, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.3.1"; - sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5"; + version = "0.10.4"; + sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore + base64Bytestring blazeHtml ConfigFile feed filepath filestore ghcPaths happstackServer highlightingKate hslogger HStringTemplate HTTP json mtl network pandoc pandocTypes parsec random recaptcha - safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize - zlib + safe SHA split syb tagsoup text time uri url utf8String xhtml xml + xssSanitize zlib ]; jailbreak = true; - patches = [ (fetchpatch { - url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch"; - sha256 = "16n372wrikwb3g4pb3zljxnp19in0828wp40diqgkplhlnwww6nw"; - }) - ]; - preConfigure = '' - sed -i -e 's|network .*< 2.5|network|' gitit.cabal - ''; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc";