svn merge ^/nixpkgs/trunk

A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
parent 0b90cd41b2 47288a2224
commit 9ee0a9df9b
237 changed files with 3563 additions and 688 deletions
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "epic";
-  version = "0.9";
-  sha256 = "0bxvabzizq0msj0fy02vqj0pylq4cbymsypi6w2babwykscrdgm0";
+  version = "0.9.2";
+  sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [ mtl ];