diff options
| author | Andres Löh <mail@andres-loeh.de> | 2012-01-16 09:55:03 +0000 |
|---|---|---|
| committer | Andres Löh <mail@andres-loeh.de> | 2012-01-16 09:55:03 +0000 |
| commit | 57d26cdd8ef6115281866545a2837cff0312c32f (patch) | |
| tree | 967ba8b4e1bd2b6056f411d96600296a6cbf4bb0 /pkgs | |
| parent | 5c64d683447685760439b581dbcd7b3505d8d1ca (diff) | |
| download | nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.tar nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.tar.gz nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.tar.bz2 nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.tar.lz nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.tar.xz nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.tar.zst nixlib-57d26cdd8ef6115281866545a2837cff0312c32f.zip | |
Adding recurseIntoAttrs for ghc-HEAD (for the ghc-7.4.1 rc phase).
svn path=/nixpkgs/trunk/; revision=31577
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 738619976545..be5414c7c0f0 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; |