Adding recurseIntoAttrs for ghc-HEAD (for the ghc-7.4.1 rc phase).

svn path=/nixpkgs/trunk/; revision=31577
This commit is contained in:
Andres Löh 2012-01-16 09:55:03 +00:00
parent 5c64d68344
commit 57d26cdd8e

View File

@ -2244,10 +2244,11 @@ let
# Reasonably current HEAD snapshot. Should *always* be lowPrio. # Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD = haskellPackages_ghcHEAD =
haskellPackagesFun ../development/compilers/ghc/head.nix recurseIntoAttrs
# (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) (haskellPackagesFun ../development/compilers/ghc/head.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary) # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
(x : x.ghcHEADPrefs) false false lowPrio; (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghcHEADPrefs) false false lowPrio);
haxeDist = import ../development/compilers/haxe { haxeDist = import ../development/compilers/haxe {
inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;