From 5422838e567c4076db935afd6e8fa00c8d46f3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 7 Jul 2011 19:08:51 +0000 Subject: [PATCH] Version bumps for hakyll and dependencies. svn path=/nixpkgs/trunk/; revision=27638 --- .../libraries/haskell/blaze-builder/default.nix | 4 ++-- .../libraries/haskell/blaze-html/default.nix | 4 ++-- .../libraries/haskell/case-insensitive/default.nix | 14 ++++++++++++++ .../libraries/haskell/hakyll/default.nix | 4 ++-- .../libraries/haskell/hamlet/default.nix | 8 ++++---- pkgs/development/libraries/haskell/snap/core.nix | 8 ++++---- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 ++ 8 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/haskell/case-insensitive/default.nix diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 8eed52f1cee5..4b8dc9b08e96 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "blaze-builder"; - version = "0.2.1.4"; - sha256 = "0r0lj2whwa1v99gx59l56af06w704qvv1vhkxlca86h7iri4b262"; + version = "0.3.0.1"; + sha256 = "1p3xlifcr7v987zx8l2sppn9yydph332mn1xxk0yfi78a6386nfb"; propagatedBuildInputs = [text]; meta = { description = "Builder to efficiently append text"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 9d7950ced1fb..e42a008a9484 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "blaze-html"; - version = "0.4.1.0"; - sha256 = "0a39wzfsb8lsr0z8c0s90n6pwmhjg6lihbxigk2c02vn5marzc4f"; + version = "0.4.1.4"; + sha256 = "1xf302dapwmmlxj9alfbdv6rcrxhr9p305s4jz2d6ckq2xzz8yjf"; propagatedBuildInputs = [text blazeBuilder]; meta = { description = "A blazingly fast HTML combinator library"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix new file mode 100644 index 000000000000..2bda4a7eefea --- /dev/null +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -0,0 +1,14 @@ +{cabal, text}: + +cabal.mkDerivation (self : { + pname = "case-insensitive"; + version = "0.2.0.2"; + sha256 = "0qn2scaxxbqi4770nwvcmb1ldj0ipa2ljxcavcn0kv48xzs519l7"; + propagatedBuildInputs = [text]; + meta = { + description = "Case insensitive string comparison"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index d8e8954e5964..8c544ccc75e0 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self : { pname = "hakyll"; - version = "3.0.2.0"; - sha256 = "0d1kmvkbwygr9mxz7m8jiasrbj470j4hwsj8mmkdgdm9clxbi74k"; + version = "3.2.0.3"; + sha256 = "0biy9p662anhhlmwa502iy8cck597q0vlwj57l6cj8kpyxj4g0lz"; propagatedBuildInputs = [ binary blazeHtml hamlet hopenssl mtl network pandoc regexBase regexPCRE snapCore snapServer strictConcurrency diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 2025b38015f0..6eb100c36f37 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,11 +1,11 @@ -{cabal, blazeBuilder, blazeHtml, failure, parsec, text, jsonEnumerator, jsonTypes}: +{cabal, blazeBuilder, blazeHtml, failure, parsec, text}: cabal.mkDerivation (self : { pname = "hamlet"; - version = "0.7.3"; - sha256 = "1knapi8506kqm6pbl1qdr3vm579z2dn6q3h3ahzwbxqjafy7pnj9"; + version = "0.8.2.1"; + sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925"; propagatedBuildInputs = - [blazeBuilder blazeHtml failure parsec text jsonEnumerator jsonTypes]; + [blazeBuilder blazeHtml failure parsec text]; meta = { description = "Haml-like template files that are compile-time checked"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 905af17b0e65..c95d36f7d504 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,13 +1,13 @@ {cabal, attoparsec, attoparsecEnumerator, MonadCatchIOTransformers, blazeBuilder -, bytestringNums, dlist, mtl, unixCompat, vector, zlib}: +, bytestringNums, caseInsensitive, dlist, mtl, unixCompat, vector, zlib}: cabal.mkDerivation (self : { pname = "snap-core"; - version = "0.4.1"; - sha256 = "0cc6qh8rnfdhv6s4clnb4avbxkvvj4dibbdg0vjbf75iafxvsg9f"; + version = "0.5.1.4"; + sha256 = "0fvff7hjyfwnii057vpg8m75qaipsklk6v6cbvms4p6wp14zqaj1"; propagatedBuildInputs = [ attoparsec attoparsecEnumerator MonadCatchIOTransformers blazeBuilder - bytestringNums dlist mtl unixCompat vector zlib + bytestringNums caseInsensitive dlist mtl unixCompat vector zlib ]; meta = { description = "Snap: A Haskell Web Framework (Core)"; diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index b29bc6363bac..14417dd0e80e 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self : { pname = "snap-server"; - version = "0.4.1"; - sha256 = "1xav58sk6f1capibkil9a834lxg7badcq3v8016azzzmvvhy9iq8"; + version = "0.5.1.4"; + sha256 = "17b95db48as418whcvbxzyvql16z1c706n0s4jryyqr6kvgpsvzp"; propagatedBuildInputs = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums directoryTree enumerator MonadCatchIOTransformers mtl murmurHash diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e244ca8fc95e..b987afcdb94f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -363,6 +363,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) cairo zlib; }; + caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {}; + cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; cereal = callPackage ../development/libraries/haskell/cereal {};