From b6d994e9b7d60a0d7bc8818ba5461a2b52b9565b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:46:30 +0000 Subject: [PATCH] pkgs/top-level/all-packages.nix: bootstrap ghc 7.0.4 and 7.2.1 with 7.0.4-binary on Darwin svn path=/nixpkgs/trunk/; revision=28864 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac5fcd1cc23..9d03b703290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2148,12 +2148,14 @@ let haskellPackages_ghc704 = haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) false false (x : x); + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) false false (x : x); haskellPackages_ghc721 = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.2.1.nix - ghc6121Binary (x : x.ghc721Prefs) false false lowPrio); + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghc721Prefs) false false lowPrio); # Still a release candidate. haskellPackages_ghcHEAD =