Upgraded Hakyll to 2.4.3.

I know, that's not the latest version, but Hakyll-3 is rather
different from Hakyll-2 and the upgrade would require more work.

svn path=/nixpkgs/trunk/; revision=26291
This commit is contained in:
Andres Löh 2011-03-13 08:46:54 +00:00
parent 6a33045532
commit f89b676312
8 changed files with 39 additions and 25 deletions

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "blaze-builder";
version = "0.1";
sha256 = "dc4c542a39cf9e82b6a7ca99d6f460d6fa8dc4c8f648224368eac3fe054127c5";
version = "0.2.1.4";
sha256 = "0r0lj2whwa1v99gx59l56af06w704qvv1vhkxlca86h7iri4b262";
propagatedBuildInputs = [text];
meta = {
description = "Builder to efficiently append text";

View File

@ -1,10 +1,10 @@
{cabal, text}:
{cabal, text, blazeBuilder}:
cabal.mkDerivation (self : {
pname = "blaze-html";
version = "0.1.2";
sha256 = "c1e65e3d23e90a3830ceee69ecfac65c7a8a045da06443fb7690609a59480f5f";
propagatedBuildInputs = [text];
version = "0.4.1.0";
sha256 = "0a39wzfsb8lsr0z8c0s90n6pwmhjg6lihbxigk2c02vn5marzc4f";
propagatedBuildInputs = [text blazeBuilder];
meta = {
description = "A blazingly fast HTML combinator library";
license = "BSD";

View File

@ -1,10 +1,12 @@
{cabal, binary, hamlet, mtl, network, pandoc, regexBase, regexTDFA, time}:
{cabal, binary, blazeHtml, hamlet, mtl, network, pandoc, regexBase,
regexTDFA}:
cabal.mkDerivation (self : {
pname = "hakyll";
version = "2.3";
sha256 = "40e57c5cf5be3c6fdc270d00ff765a2b3e11ba7e302f40146d83048aa4436116";
propagatedBuildInputs = [hamlet mtl network pandoc regexBase regexTDFA time];
version = "2.4.3";
sha256 = "1n1hibwhg22l9p126d10zwhvaab46svcri2rkvd78f4vhmwpvkbs";
propagatedBuildInputs =
[binary blazeHtml hamlet mtl network pandoc regexBase regexTDFA];
meta = {
description = "A simple static site generator library";
license = "BSD";

View File

@ -1,12 +1,11 @@
{cabal, blazeHtml, blazeBuilder, parsec, utf8String, failure, neither}:
{cabal, blazeBuilder, failure, parsec, text}:
cabal.mkDerivation (self : {
pname = "hamlet";
version = "0.5.0";
sha256 = "92d8e099fa63fe218e2c8c4da56ac86b0b0bb49139467b8f12595c4436d1ad0b";
propagatedBuildInputs = [
blazeHtml blazeBuilder parsec utf8String failure neither
];
version = "0.6.1.2";
sha256 = "0aqrjdbqb99nz3snnsrgkd6bnaj1m3bdm8kj9agd3qgv8lv90knn";
propagatedBuildInputs =
[blazeBuilder failure parsec text];
meta = {
description = "Haml-like template files that are compile-time checked";
license = "BSD";

View File

@ -0,0 +1,13 @@
{cabal, transformers}:
cabal.mkDerivation (self : {
pname = "monad-peel";
version = "0.1";
sha256 = "0q56hdjgbj7ykpjx5z8qlqqkngmgm5wzm9vwcd7v675k2ywcl3ys";
propagatedBuildInputs = [transformers];
meta = {
description = "Lift control operations like exception catching through monad transformers";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

View File

@ -1,11 +1,11 @@
{cabal, failure, mtl, transformers, MonadCatchIOMtl, MonadCatchIOTransformers}:
{cabal, failure, monadPeel, transformers}:
cabal.mkDerivation (self : {
pname = "neither";
version = "0.0.2";
sha256 = "1e1b934d9d1918bd762bb8d6cde35c56883543c2d0c165a661f096c2ce5ab139";
version = "0.2.0";
sha256 = "0a2lyx3dvgzj4g6p69x1fma4rmwxrykji3hc4diqgc4hx02p16jh";
propagatedBuildInputs = [
failure mtl transformers MonadCatchIOMtl MonadCatchIOTransformers
failure monadPeel transformers
];
meta = {
description = "A simple type class for success/failure computations";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "regex-tdfa";
version = "1.1.4";
sha256 = "382c7ed1ee75448574b42e9ecb9228b25f55143f3008ecd6f5d3a30471337b39";
version = "1.1.8";
sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x";
propagatedBuildInputs = [mtl parsec regexBase];
meta = {
description = "Replaces/Enhances Text.Regex";

View File

@ -464,9 +464,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
graphviz = callPackage ../development/libraries/haskell/graphviz {};
hakyll = callPackage ../development/libraries/haskell/hakyll {
time = self.time_1_2_0_3;
};
hakyll = callPackage ../development/libraries/haskell/hakyll {};
hamlet = callPackage ../development/libraries/haskell/hamlet {};
@ -596,6 +594,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
monadlab = callPackage ../development/libraries/haskell/monadlab {};
monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
monadsFd = callPackage ../development/libraries/haskell/monads-fd {};