Author: simons
Date: Fri Jul 15 12:53:21 2011
New Revision: 27799
URL: https://svn.nixos.org/websvn/nix/?rev=27799&sc=1
Log:
ghc: build GHC on haskellPlatforms instead of linux++darwin to avoid evaluation
errors on Hydra because x86_64-darwin is unsupported
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Fri Jul
15 12:47:20 2011 (r27798)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Fri Jul
15 12:53:21 2011 (r27799)
@@ -100,5 +100,5 @@
[ $(./main) == "yes" ]
'';
- meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
+ meta.platforms = stdenv.lib.platforms.haskellPlatforms;
}
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix Fri Jul 15
12:47:20 2011 (r27798)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix Fri Jul 15
12:53:21 2011 (r27799)
@@ -37,7 +37,7 @@
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ platforms = stdenv.lib.platforms.haskellPlatforms;
};
}
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix Fri Jul 15
12:47:20 2011 (r27798)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix Fri Jul 15
12:53:21 2011 (r27799)
@@ -37,7 +37,7 @@
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ platforms = stdenv.lib.platforms.haskellPlatforms;
};
}
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Fri Jul 15
12:47:20 2011 (r27798)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Fri Jul 15
12:53:21 2011 (r27799)
@@ -37,7 +37,7 @@
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ platforms = stdenv.lib.platforms.haskellPlatforms;
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
