From 66dbd40cb7d62d34ec3d44ce08a45d7e531cffaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Jul 2011 12:53:21 +0000 Subject: [PATCH] ghc: build GHC on haskellPlatforms instead of linux++darwin to avoid evaluation errors on Hydra because x86_64-darwin is unsupported svn path=/nixpkgs/trunk/; revision=27799 --- pkgs/development/compilers/ghc/6.10.1-binary.nix | 2 +- pkgs/development/compilers/ghc/7.0.2.nix | 2 +- pkgs/development/compilers/ghc/7.0.3.nix | 2 +- pkgs/development/compilers/ghc/7.0.4.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix index 459a1b94724..c43f8525a33 100644 --- a/pkgs/development/compilers/ghc/6.10.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix @@ -100,5 +100,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ; + meta.platforms = stdenv.lib.platforms.haskellPlatforms; } diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index c99c8c813f1..ca59a8b5311 100644 --- a/pkgs/development/compilers/ghc/7.0.2.nix +++ b/pkgs/development/compilers/ghc/7.0.2.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.haskellPlatforms; }; } diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index 210de944587..b1ecb5a1db6 100644 --- a/pkgs/development/compilers/ghc/7.0.3.nix +++ b/pkgs/development/compilers/ghc/7.0.3.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.haskellPlatforms; }; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 3892efd0546..ca3f72f08e4 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.haskellPlatforms; }; }