Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal.

This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems
that don't distinguish case.

svn path=/nixpkgs/trunk/; revision=32401

2 files changed, 1 insertions, 1 deletions

diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/build-support/cabal/default.nix
index 8ae8c06d5132..8ae8c06d5132 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/build-support/cabal/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 803e42a1b945..53d495eb4c57 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -121,7 +121,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   # This is the Cabal builder, the function we use to build most Haskell
   # packages. It isn't the Cabal library, which is spelled "Cabal".
 
-  cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {
+  cabal = callPackage ../build-support/cabal {
     enableLibraryProfiling = enableLibraryProfiling;
   };