svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32330

pkgs/development/compilers/epic/default.nix

@@ -1,4 +1,4 @@
-{ cabal, boehmgc, gmp, happy, mtl }:
+{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "epic";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ happy ];
   extraLibraries = [ boehmgc gmp ];
   meta = {

pkgs/development/compilers/idris/default.nix

@@ -1,4 +1,5 @@
-{ cabal, binary, epic, happy, haskeline, mtl, parsec, transformers
+{ cabal, binary, Cabal, epic, filepath, happy, haskeline, mtl
+, parsec, transformers
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ binary epic haskeline mtl parsec transformers ];
+  buildDepends = [
+    binary Cabal epic filepath haskeline mtl parsec transformers
+  ];
   buildTools = [ happy ];
   noHaddock = true;
   meta = {