* Cabal builder: put the GHC version in the default name attribute to

disambiguate between package instances built with different GHCs.

svn path=/nixpkgs/trunk/; revision=15132
This commit is contained in:
Eelco Dolstra 2009-04-18 16:21:59 +00:00
parent 37f707fd92
commit ca8b45d441
3 changed files with 6 additions and 5 deletions

View File

@ -1,14 +1,15 @@
{stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses, haddock}:
stdenv.mkDerivation rec {
name = "ghc-6.8.3";
version = "6.8.3";
name = "ghc-${version}";
homepage = "http://www.haskell.org/ghc";
src = map fetchurl [
{ url = "${homepage}/dist/6.8.3/${name}-src.tar.bz2";
{ url = "${homepage}/dist/${version}/${name}-src.tar.bz2";
sha256 = "1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b";
}
{ url = "${homepage}/dist/6.8.3/${name}-src-extralibs.tar.bz2";
{ url = "${homepage}/dist/${version}/${name}-src-extralibs.tar.bz2";
sha256 = "ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2";
}
];

View File

@ -17,7 +17,7 @@ attrs :
# all packages with haskell- to avoid name clashes for libraries;
# if that is not desired (for applications), name can be set to
# fname.
name = "haskell-${self.fname}";
name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}";
# the default download location for Cabal packages is Hackage,
# you still have to specify the checksum

View File

@ -1868,7 +1868,7 @@ let
inherit fetchurl stdenv perl ncurses gmp libedit;
});
haskellPackages = haskellPackages_ghc6102;
haskellPackages = recurseIntoAttrs haskellPackages_ghc6102;
haskellPackages_ghc6102 = import ./haskell-packages.nix {
inherit pkgs;