Author: simons
Date: Thu Apr 19 10:22:03 2012
New Revision: 33838
URL: https://nixos.org/websvn/nix/?rev=33838&sc=1
Log:
Updated Haskell packages.
- cabal-install: added support for version 0.14.0 to GHC 7.0.4, 6.12.3, and
6.10.4
- crypto-conduit: updated to version 0.3.1
- haskell-src-exts: updated to version 1.13.2
- hjsmin: updated to version 0.1.0
- persistent: updated to version 0.9.0.2
- wai-extra: updated to version 1.2.0.3
- wxdirect: updated to version 0.90.0.1
- yesod-core: updated to version 1.0.1
- yesod-default: updated to version 1.0.1
- yesod-form: updated to version 1.0.0.2
- yesod-routes: updated to version 1.0.1
- yesod: updated to version 1.0.1
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
- copied, changed from r33835,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hjsmin/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-default/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-routes/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-conduit";
- version = "0.3.0.1";
- sha256 = "1j7j1ga9in9j9i5gxdkpijarcw7a0y8w0z4sj00d2yzb1qhdalzq";
+ version = "0.3.1";
+ sha256 = "0hb9wkq70bmx54vksj78f0av1byvksjhqlr730cfc5fc6w60kzqk";
buildDepends = [ cereal conduit cryptoApi transformers ];
meta = {
homepage = "https://github.com/meteficha/crypto-conduit";;
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
(from r33835,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix)
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
Wed Apr 18 18:42:44 2012 (r33835, copy source)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-exts";
- version = "1.13.0";
- sha256 = "1kkhv8frvrry9jb38p5xmsqij0wrz88gszz5zcndcmbhkr5d4b64";
+ version = "1.13.2";
+ sha256 = "1vq4qagbypm8lp4dr6zjd6mhgiv096a2cpyfvfs3yq06iqv5x602";
buildDepends = [ cpphs ];
buildTools = [ happy ];
meta = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hjsmin/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hjsmin/default.nix Thu Apr
19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hjsmin/default.nix Thu Apr
19 10:22:03 2012 (r33838)
@@ -2,10 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
- version = "0.0.16";
- sha256 = "0svpmhrzhra3yhc1bzwga9d13k4kd8vw6va1q9866pkw385j5jr4";
- isLibrary = true;
- isExecutable = true;
+ version = "0.1.0";
+ sha256 = "071aa5xvg4arrmphrr6880kmgjifrglnhiabrc7iv0r5ycgav001";
buildDepends = [ blazeBuilder languageJavascript text ];
meta = {
homepage = "http://github.com/alanz/hjsmin";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
- version = "0.9.0.1";
- sha256 = "0qlvlv7rlxs4r5w5hr4vbj1bwjkn3nzpk2w8q52cnn2c37wz24h8";
+ version = "0.9.0.2";
+ sha256 = "0m9m13gyjmzk33da2jd0b4l061n0gg6xj6rrnrnli2n8f70ywlnv";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl pathPieces poolConduit resourcet text time
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
- version = "1.2.0.2";
- sha256 = "0kfbk505nli51h9lx8865gfgcnji7kgxcjfmfdanv1im00ghrq1v";
+ version = "1.2.0.3";
+ sha256 = "0iigswknh5w5zi6r99jks3bppylnw9hca9by2klwr2biw07nf09d";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault fastLogger httpTypes network text time
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "wxdirect";
- version = "0.90";
- sha256 = "0vlqvj9sys5d2x9ccpq0yxqbsq060g4jb6xrckjspxb605c98r3r";
+ version = "0.90.0.1";
+ sha256 = "04jslgxw601g6wh8f2wrdnipzh6x0487kfxb89fkgfgjhxrkfyr3";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec strict time ];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "1.0.0.2";
- sha256 = "0l6mfgcw0jmm941w7s0df091hm1c1v66p8sc89xjqzcwvdhcnyyd";
+ version = "1.0.1";
+ sha256 = "15i4ysyf6j137aia0mv1kvh7pnmdnj89wgcj70all9v1413rxzgq";
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
conduit cookie failure fastLogger hamlet httpTypes liftedBase
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-default/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-default/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-default/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-default";
- version = "1.0.0";
- sha256 = "1l6x56ky3jf20nvz03jsxs19dvh1rz108gzhgbh86qjhcisaaqvi";
+ version = "1.0.1";
+ sha256 = "1b9qxfs9pbgn090cipnnbd6vf1ajyhs0xjfynkj87k8fx6j2lqb9";
buildDepends = [
networkConduit shakespeareCss shakespeareJs text transformers
unorderedContainers wai waiExtra warp yaml yesodCore
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-form/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
- version = "1.0.0.1";
- sha256 = "072q0sjx88dhpp8qz6lschb8y8hf1n6fqhxan69djaz03jrm164l";
+ version = "1.0.0.2";
+ sha256 = "1jvp0hw9kprwcwdxx1i2aazycf03i1vf8q5vjmdpynhgzyrpkrx1";
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-routes/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-routes/default.nix
Thu Apr 19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-routes/default.nix
Thu Apr 19 10:22:03 2012 (r33838)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
- version = "1.0.0";
- sha256 = "1sqlcawsbv8sz22prcg41dvma6kywyl18dwp7msjlbkxgc2msp3a";
+ version = "1.0.1";
+ sha256 = "12m2j7sl7gr8755xza7k5nlqxl4g7az3vin5vdl8km5aw754761w";
buildDepends = [ pathPieces text vector ];
meta = {
homepage = "http://www.yesodweb.com/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Thu Apr
19 08:29:22 2012 (r33837)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix Thu Apr
19 10:22:03 2012 (r33838)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
- version = "1.0.0.2";
- sha256 = "171a7nbcz48ykdn9sz6gzpnkjhv2n75c8v9gdlp9slbnmbphq94p";
+ version = "1.0.1";
+ sha256 = "0ff72z0ixx5xdd2n6vrn474ga4n5zzr1z566s9wb54lqxd8vrdn0";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Apr 19 08:29:22
2012 (r33837)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Apr 19 10:22:03
2012 (r33838)
@@ -210,6 +210,7 @@
haskellPlatform = self.haskellPlatform_2011_4_0_0;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; };
};
haskellPlatform_2011_4_0_0 =
@@ -252,6 +253,7 @@
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
};
haskellPlatform_2011_2_0_1 =
@@ -294,6 +296,7 @@
haskellPlatform = self.haskellPlatform_2011_2_0_0;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
};
haskellPlatform_2011_2_0_0 =
@@ -332,6 +335,7 @@
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -412,6 +416,7 @@
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
text = self.text_0_11_0_6;
repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal =
self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -797,8 +802,8 @@
haskellSrc = self.haskellSrc_1_0_1_5;
haskellSrcExts_1_11_1 = callPackage
../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
- haskellSrcExts_1_13_0 = callPackage
../development/libraries/haskell/haskell-src-exts/1.13.0.nix {};
- haskellSrcExts = self.haskellSrcExts_1_13_0;
+ haskellSrcExts_1_13_2 = callPackage
../development/libraries/haskell/haskell-src-exts/1.13.2.nix {};
+ haskellSrcExts = self.haskellSrcExts_1_13_2;
haskellSrcMeta = callPackage
../development/libraries/haskell/haskell-src-meta {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
