Author: simons
Date: Mon Aug 29 20:26:52 2011
New Revision: 28887
URL: https://svn.nixos.org/websvn/nix/?rev=28887&sc=1
Log:
haskell-hamlet: added version 0.10.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix
- copied, changed from r28886,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
- copied, changed from r28886,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix (from
r28886, nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix Mon Aug
29 20:26:45 2011 (r28886, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.10.0.nix Mon Aug
29 20:26:52 2011 (r28887)
@@ -1,12 +1,16 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare
+, text
+}:
cabal.mkDerivation (self: {
pname = "hamlet";
- version = "0.8.2.1";
- sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925";
- buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+ version = "0.10.0";
+ sha256 = "0xqlc03g0qnpnrw957108rpjbs88p9wwvcgmz7vc1f0k88lc0h6n";
+ buildDepends = [
+ blazeBuilder blazeHtml failure parsec shakespeare text
+ ];
meta = {
- homepage = "http://www.yesodweb.com/";;
+ homepage = "http://www.yesodweb.com/book/templates";;
description = "Haml-like template files that are compile-time checked";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix (from
r28886, nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:45
2011 (r28886)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 29 20:26:52
2011 (r28887)
@@ -649,9 +649,13 @@
graphviz = callPackage ../development/libraries/haskell/graphviz {};
- hakyll = callPackage ../development/libraries/haskell/hakyll {};
+ hakyll = callPackage ../development/libraries/haskell/hakyll {
+ hamlet = self.hamlet_0_8_2_1;
+ };
- hamlet = callPackage ../development/libraries/haskell/hamlet {};
+ hamlet_0_8_2_1 = callPackage
../development/libraries/haskell/hamlet/0.8.2.1.nix {};
+ hamlet_0_10_0 = callPackage
../development/libraries/haskell/hamlet/0.10.0.nix {};
+ hamlet = self.hamlet_0_10_0;
happstackData = callPackage
../development/libraries/haskell/happstack/happstack-data.nix {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
