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
This commit is contained in:
Peter Simons 2012-02-14 16:58:56 +00:00
parent 6e3f66185d
commit 89a958e4d0
2 changed files with 22 additions and 2 deletions

View File

@ -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
];
};
})

View File

@ -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 {