svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
parent b14a737a4d 57b612cb05
commit 0210e20b5a
74 changed files with 833 additions and 339 deletions
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "epic";
-  version = "0.9.2";
-  sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
+  version = "0.9.3";
+  sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [ Cabal mtl ];
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "idris";
-  version = "0.9.1";
-  sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
+  version = "0.9.2";
+  sha256 = "0n4dh3vxkjvw8rb5iqm8lvi21q2ljw2pzn453wfcisdadkpv4fh5";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [