Author: simons
Date: Mon Aug 29 07:46:30 2011
New Revision: 28864
URL: https://svn.nixos.org/websvn/nix/?rev=28864&sc=1
Log:
pkgs/top-level/all-packages.nix: bootstrap ghc 7.0.4 and 7.2.1 with
7.0.4-binary on Darwin
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 07:39:29
2011 (r28863)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 29 07:46:30
2011 (r28864)
@@ -2148,12 +2148,14 @@
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 =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
