From 57d26cdd8ef6115281866545a2837cff0312c32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 16 Jan 2012 09:55:03 +0000 Subject: [PATCH] Adding recurseIntoAttrs for ghc-HEAD (for the ghc-7.4.1 rc phase). svn path=/nixpkgs/trunk/; revision=31577 --- pkgs/top-level/all-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73861997654..be5414c7c0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2244,10 +2244,11 @@ let # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = - haskellPackagesFun ../development/compilers/ghc/head.nix - # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) - (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) - (x : x.ghcHEADPrefs) false false lowPrio; + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/head.nix + # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghcHEADPrefs) false false lowPrio); haxeDist = import ../development/compilers/haxe { inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;