mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:21:57 +03:00
* 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:
parent
37f707fd92
commit
ca8b45d441
@ -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";
|
||||
}
|
||||
];
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user