diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/haskell/gitit/default.nix | |
parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
download | nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixlib-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/haskell/gitit/default.nix')
-rw-r--r-- | pkgs/development/libraries/haskell/gitit/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 0e0f147bab9f..d256c2f014f0 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -2,25 +2,24 @@ { cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed , filepath, filestore, ghcPaths, happstackServer, highlightingKate -, hoauth2, hslogger, HStringTemplate, HTTP, httpClient -, httpClientTls, json, mtl, network, networkUri, pandoc -, pandocTypes, parsec, random, recaptcha, safe, SHA, split, syb -, tagsoup, text, time, uri, url, utf8String, xhtml, xml -, xssSanitize, zlib +, hoauth2, hslogger, HStringTemplate, HTTP, httpClientTls +, httpConduit, json, mtl, network, networkUri, pandoc, pandocTypes +, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text +, time, uri, url, utf8String, uuid, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.5"; - sha256 = "0p2x2l729rwals0kx8ymk6j3fqvlyjvrj6mmh8slcg93h4smwb4j"; + version = "0.10.6.1"; + sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore ghcPaths happstackServer highlightingKate hoauth2 hslogger - HStringTemplate HTTP httpClient httpClientTls json mtl network + HStringTemplate HTTP httpClientTls httpConduit json mtl network networkUri pandoc pandocTypes parsec random recaptcha safe SHA - split syb tagsoup text time uri url utf8String xhtml xml + split syb tagsoup text time uri url utf8String uuid xhtml xml xssSanitize zlib ]; jailbreak = true; |