Author: simons
Date: Mon Apr 23 09:34:01 2012
New Revision: 33889
URL: https://nixos.org/websvn/nix/?rev=33889&sc=1
Log:
Updated Haskell packages.
- alternative-io: updated to version 0.0.1
- blaze-markup: added version 0.5.1.0
- crypto-conduit: updated to version 0.3.2
- cryptohash: updated to version 0.7.5
- darcs: updated to version 2.8.0
- filestore: updated to version 0.4.2
- Graphalyze: cosmetic change
- hamlet: updated to version 1.0.1.1
- happstack-hamlet: updated to version 7.0.1
- happstack-server: updated to version 7.0.1
- HFuse: updated to version 0.2.4.1
- Hipmunk: updated to version 5.2.0.8
- language-javascript: updated to version 0.5.2
- libmpd: updated to version 0.8.0
- lifted-base: updated to version 0.1.0.4
- monad-control: updated to version 0.3.1.2
- persistent: updated to version 0.9.0.3
- regex-compat: use latest version when building with GHC 7.4.1
- skein: updated to version 0.1.0.7
- snap-core: updated to version 0.8.1
- snap-server: updated to version 0.8.1.1
- tls: updated to version 0.9.5
- vty: updated to version 4.7.0.12
- wai-app-static: updated to version 1.2.0.2
- yesod-core: updated to version 1.0.1.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-markup/
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-markup/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
- copied, changed from r33888,
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/alternative-io/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/cryptohash/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/filestore/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-server.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/libmpd/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/lifted-base/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/vty/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -1,17 +1,18 @@
{ cabal, curl, extensibleExceptions, filepath, hashedStorage
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
-, regexCompat, tar, terminfo, text, zlib
+, regexCompat, tar, terminfo, text, vector, zlib
}:
cabal.mkDerivation (self: {
pname = "darcs";
- version = "2.5.2";
- sha256 = "11mk1xcrxk2x5c0s96s19wb4xvhjl9s59bdqcrj8f4w09zbgjlw9";
+ version = "2.8.0";
+ sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath hashedStorage haskeline html HTTP
- mmap mtl network parsec random regexCompat tar terminfo text zlib
+ mmap mtl network parsec random regexCompat tar terminfo text vector
+ zlib
];
extraLibraries = [ curl ];
meta = {
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -13,8 +13,6 @@
description = "Graph-Theoretic Analysis library";
license = "unknown";
platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- ];
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Hipmunk";
- version = "5.2.0.7";
- sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k";
+ version = "5.2.0.8";
+ sha256 = "0xsckndxmzbp32fqb8i90k21rz0xjj3smxjijw742l637p3mv5zw";
buildDepends = [ StateVar transformers ];
meta = {
homepage = "http://patch-tag.com/r/felipe/hipmunk/home";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/alternative-io/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/alternative-io/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/alternative-io/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -3,13 +3,13 @@
cabal.mkDerivation (self: {
pname = "alternative-io";
- version = "0.0.0";
- sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y";
+ version = "0.0.1";
+ sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
buildDepends = [
liftedBase monadControl transformers transformersBase
];
meta = {
- description = "IO as Alternative instance";
+ description = "IO as Alternative instance (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-markup/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-markup/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -0,0 +1,15 @@
+{ cabal, blazeBuilder, text }:
+
+cabal.mkDerivation (self: {
+ pname = "blaze-markup";
+ version = "0.5.1.0";
+ sha256 = "0vq0xzwa13sjybg6zdi3ynsn6yxyl1q6rbalvb9r6f3plrmik37a";
+ buildDepends = [ blazeBuilder text ];
+ meta = {
+ homepage = "http://jaspervdj.be/blaze";;
+ description = "A blazingly fast markup combinator library for Haskell";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,12 +2,9 @@
cabal.mkDerivation (self: {
pname = "crypto-conduit";
- version = "0.3.1";
- sha256 = "0hb9wkq70bmx54vksj78f0av1byvksjhqlr730cfc5fc6w60kzqk";
+ version = "0.3.2";
+ sha256 = "09f6l60wcblp15hx3hppskjsyah9bh6jwqqr4dvl6j03011gx4id";
buildDepends = [ cereal conduit cryptoApi transformers ];
- patchPhase = ''
- sed -i -e 's|crypto-api >= 0.9 && < 0.10|crypto-api|' crypto-conduit.cabal
- '';
meta = {
homepage = "https://github.com/meteficha/crypto-conduit";;
description = "Conduit interface for cryptographic operations (from
crypto-api)";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/cryptohash/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cryptohash/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cryptohash/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
- version = "0.7.4";
- sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab";
+ version = "0.7.5";
+ sha256 = "18x1k22m2mw0jx3p1mc68n0gg1vsnkp50qvmlkh3i34vdnjcdrqg";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi tagged ];
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/filestore/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/filestore/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/filestore/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -1,10 +1,16 @@
-{ cabal, Diff, filepath, parsec, split, time, utf8String, xml }:
+{ cabal, Diff, filepath, HUnit, mtl, parsec, split, time
+, utf8String, xml
+}:
cabal.mkDerivation (self: {
pname = "filestore";
- version = "0.4.1";
- sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7";
- buildDepends = [ Diff filepath parsec split time utf8String xml ];
+ version = "0.4.2";
+ sha256 = "1zv5c1r82a77p6dadabj8853a0z7p8qrk0fdxvr9sr02zd95cg16";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ Diff filepath HUnit mtl parsec split time utf8String xml
+ ];
meta = {
homepage = "http://johnmacfarlane.net/repos/filestore";;
description = "Interface for versioning file stores";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
- version = "1.0.1";
- sha256 = "1h3bq9vignnbvnjwr35yf4am0k90l1c21x0phnhnigdx7wanygcz";
+ version = "1.0.1.1";
+ sha256 = "16a7aym0cpcq9lsiwfh5bvgh1bkyz4j06bhyvnxawsdgzmmsbch4";
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,12 +2,9 @@
cabal.mkDerivation (self: {
pname = "happstack-hamlet";
- version = "7.0.0";
- sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j";
+ version = "7.0.1";
+ sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n";
buildDepends = [ hamlet happstackServer text ];
- patchPhase = ''
- sed -i 's|hamlet >= 0.10 && <0.11|hamlet|' happstack-hamlet.cabal
- '';
meta = {
homepage = "http://www.happstack.com/";;
description = "Support for Hamlet HTML templates in Happstack";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-server.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-server.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-server.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -1,19 +1,19 @@
{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
, filepath, hslogger, html, monadControl, mtl, network, parsec
-, sendfile, syb, text, time, transformers, transformersBase
-, utf8String, xhtml, zlib
+, sendfile, syb, systemFilepath, text, time, transformers
+, transformersBase, utf8String, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "happstack-server";
- version = "7.0.0";
- sha256 = "09i573gracz04z8b5rls7jm6hq5dfg7a4gkn7xpfsl1nmhnf1xhv";
+ version = "7.0.1";
+ sha256 = "0sjcfxcpv9sssk5fr5np57b10rajcid7x582s5ialf3yc9n1fshj";
isLibrary = true;
isExecutable = true;
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
- html monadControl mtl network parsec sendfile syb text time
- transformers transformersBase utf8String xhtml zlib
+ html monadControl mtl network parsec sendfile syb systemFilepath
+ text time transformers transformersBase utf8String xhtml zlib
];
meta = {
homepage = "http://happstack.com";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HFuse";
- version = "0.2.4";
- sha256 = "1v3kfkm2rz7bvwk0j8p9rhnnsffbnkismnsq0fkgnzi5z0bz5sgv";
+ version = "0.2.4.1";
+ sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k";
extraLibraries = [ fuse ];
preConfigure = ''
@@ -11,7 +11,7 @@
'';
meta = {
- homepage = "https://github.com/realdesktop/hfuse";;
+ homepage = "https://github.com/toothbrush/hfuse";;
description = "HFuse is a binding for the Linux FUSE library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-javascript";
- version = "0.5.1";
- sha256 = "12nb951xcsg1qxrg347f4sxmdzi78vxwkjhx0fib6pkbcz9yqf5q";
+ version = "0.5.2";
+ sha256 = "0q9xy72z7i2ivqzbjzn9nl5y0x07d2y3a737yw26a4zhbmhwg236";
buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
buildTools = [ happy ];
meta = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/libmpd/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/libmpd/default.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/libmpd/default.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -1,12 +1,10 @@
-{ cabal, filepath, mtl, network, time, utf8String }:
+{ cabal, filepath, mtl, network, text, time, utf8String }:
cabal.mkDerivation (self: {
pname = "libmpd";
- version = "0.7.2";
- sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap";
- isLibrary = true;
- isExecutable = true;
- buildDepends = [ filepath mtl network time utf8String ];
+ version = "0.8.0";
+ sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya";
+ buildDepends = [ filepath mtl network text time utf8String ];
meta = {
homepage = "http://github.com/joachifm/libmpd-haskell";;
description = "An MPD client library";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/lifted-base/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/lifted-base/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/lifted-base/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
- version = "0.1.0.3";
- sha256 = "1fk2jv8xwjb4xmzcx7h74nh14i3wf5mpifiki9rvq4hnrb7gdx36";
+ version = "0.1.0.4";
+ sha256 = "0xd41nminlrj78l2ggcba6z764c5v6x9w08d6mb0qk3ssj7ldv89";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
(from r33888,
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
Mon Apr 23 04:25:18 2012 (r33888, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-control";
- version = "0.3.1";
- sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45";
+ version = "0.3.1.2";
+ sha256 = "0nrvz5zc5w7j2payg7ji7dpvkbk4ssg75pwi3pqjq6jrfyf4aw9m";
buildDepends = [
baseUnicodeSymbols transformers transformersBase
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
- version = "0.9.0.2";
- sha256 = "0m9m13gyjmzk33da2jd0b4l061n0gg6xj6rrnrnli2n8f70ywlnv";
+ version = "0.9.0.3";
+ sha256 = "07w2d5x4wlbs8smkq2mini4rkmdd38zmapwqcn59vna8cq9wslz6";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl pathPieces poolConduit resourcet text time
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -2,10 +2,11 @@
cabal.mkDerivation (self: {
pname = "skein";
- version = "0.1.0.6";
- sha256 = "041qg0vy5h5xd0142chbmkhmqxbglrb7x0ybcalrxr7dawxksm8d";
+ version = "0.1.0.7";
+ sha256 = "13yhbp17iq30cjh9fid3l0wkyvpj0f1b1bak9s7gfj96basg9ig2";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
+ homepage = "https://github.com/meteficha/skein";;
description = "Skein, a family of cryptographic hash functions. Includes
Skein-MAC as well.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "snap-core";
- version = "0.8.0.1";
- sha256 = "0lw1c5gczb75878vr5acjck656aq5zg1hva9bfny321v0442azds";
+ version = "0.8.1";
+ sha256 = "11r4zd9z241qvzji7gcmynkib5w9b7c7wa8jx7al2z2aq4qhfx1b";
buildDepends = [
attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
blazeBuilderEnumerator bytestringMmap bytestringNums
@@ -17,9 +17,6 @@
MonadCatchIOTransformers mtl mwcRandom regexPosix text time
transformers unixCompat unorderedContainers vector zlibEnum
];
- patchPhase = ''
- sed -i -e 's|MonadCatchIO-transformers >= 0.2.1 && <
0.3|MonadCatchIO-transformers|' snap-core.cabal
- '';
meta = {
homepage = "http://snapframework.com/";;
description = "Snap: A Haskell Web Framework (core interfaces and types)";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
- version = "0.8.0.1";
- sha256 = "1648p0m4n4ha4976gw891z112rzxd9q4s7n4x3v0z3qb10aynxjb";
+ version = "0.8.1.1";
+ sha256 = "0k47z9fhc64bnv86ixaxvndwc7hk28ny3mf5ny9d5jmp77a3ws46";
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
@@ -16,9 +16,6 @@
PSQueue snapCore text time transformers unixCompat vector
vectorAlgorithms
];
- patchPhase = ''
- sed -i -e 's|MonadCatchIO-transformers >= 0.2.1 && <
0.3|MonadCatchIO-transformers|' snap-server.cabal
- '';
meta = {
homepage = "http://snapframework.com/";;
description = "A fast, iteratee-based, epoll-enabled web server for the
Snap Framework";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls";
- version = "0.9.4";
- sha256 = "1yvarwd3cbagg14pk6fj3r1jhvrwnbz042fdxvw9jjrdz9khy0wc";
+ version = "0.9.5";
+ sha256 = "1nbfimyxi546n239brhw5lrb7907svvhvy5zgy1f853h17vnli5y";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/vty/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/vty/default.nix Mon Apr
23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vty/default.nix Mon Apr
23 09:34:01 2012 (r33889)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "vty";
- version = "4.7.0.10";
- sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v";
+ version = "4.7.0.12";
+ sha256 = "0mmx8rhj6k8c56qhaz7ay2yf9x61h27zxs14mrkw2y4qag6d4bii";
buildDepends = [
deepseq mtl parallel parsec terminfo utf8String vector
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
- version = "1.2.0.1";
- sha256 = "0z3bx6sx3f5k00x0i9lk81a3gh9blnsqw55w89l0pl946fv002pc";
+ version = "1.2.0.2";
+ sha256 = "15rd2vlx3ag5bavrivscah7yqm9lv14v68wr3p9incg2ksf8h7d7";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
httpDate httpTypes text time transformers unixCompat wai
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Mon Apr 23 09:34:01 2012 (r33889)
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "1.0.1";
- sha256 = "15i4ysyf6j137aia0mv1kvh7pnmdnj89wgcj70all9v1413rxzgq";
+ version = "1.0.1.1";
+ sha256 = "05zspm7dfkjzb40839qnf002hxsav01vxkv3dccidvp0q340j0vz";
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
conduit cookie failure fastLogger hamlet httpTypes liftedBase
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Apr 23 04:25:18
2012 (r33888)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Apr 23 09:34:01
2012 (r33889)
@@ -146,7 +146,7 @@
parsec = self.parsec_3_1_2; # 7.4.1 ok
QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok
regexBase = self.regexBase_0_93_2; # 7.4.1 ok
- regexCompat = self.regexCompat_0_93_1; # 7.4.1 ok
+ regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok
regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok
stm = self.stm_2_3; # 7.4.1 ok
syb = self.syb_0_3_6; # 7.4.1 ok
@@ -492,6 +492,8 @@
blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
+ blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {};
+
blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
@@ -993,9 +995,7 @@
MonadCatchIOTransformers = callPackage
../development/libraries/haskell/MonadCatchIO-transformers {};
- monadControl_0_2_0_3 = callPackage
../development/libraries/haskell/monad-control/0.2.0.3.nix {};
- monadControl_0_3_1_1 = callPackage
../development/libraries/haskell/monad-control/0.3.1.1.nix {};
- monadControl = self.monadControl_0_3_1_1;
+ monadControl = callPackage ../development/libraries/haskell/monad-control {};
monadcryptorandom = callPackage
../development/libraries/haskell/monadcryptorandom {};
@@ -1011,9 +1011,7 @@
monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
- mongoDB = callPackage ../development/libraries/haskell/mongoDB {
- monadControl = self.monadControl_0_2_0_3;
- };
+ mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
mpppc = callPackage ../development/libraries/haskell/mpppc {};
@@ -1631,7 +1629,6 @@
# Applications.
darcs = callPackage ../applications/version-management/darcs {
- regexCompat = self.regexCompat93;
tar = self.tar_0_3_2_0;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
