haskell-packages.nix: allow packages to be built with a version of 'Cabal' other than the one shipped with the compiler

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

2 files changed, 22 insertions, 2 deletions

diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
new file mode 100644
index 00000000000..f87b363e88e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
@@ -0,0 +1,18 @@
+{ cabal, Cabal, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "Cabal";
+  version = "1.14.0";
+  sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j";
+  buildDepends = [ Cabal filepath ];
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "A framework for packaging Haskell software";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9e9734d7355..9154f658d96 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -119,8 +119,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 a core package of GHC
-  # and therefore not separately listed here.
+  # packages. It isn't the Cabal library, which is spelled "Cabal".
 
   cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {
     enableLibraryProfiling = enableLibraryProfiling;
@@ -505,6 +504,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
 
+  Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {};
+  Cabal = null; # core package in GHC
+
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
 
   cairo = callPackage ../development/libraries/haskell/cairo {