From cecff49b34eff66b34f1b20841f65d6930487aab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Feb 2012 17:03:35 +0000 Subject: [PATCH] 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 --- .../haskell/cabal/cabal.nix => build-support/cabal/default.nix} | 0 pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/haskell/cabal/cabal.nix => build-support/cabal/default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/build-support/cabal/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/cabal/cabal.nix rename to pkgs/build-support/cabal/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 803e42a1b94..53d495eb4c5 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; };