Author: simons
Date: Tue Aug 9 07:41:10 2011
New Revision: 28408
URL: https://svn.nixos.org/websvn/nix/?rev=28408&sc=1
Log:
pkgs/development/compilers/ghc/*-binary.nix: added a meta.platforms attribute
to all ghc bootstrap versions
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2-binary.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/6.12.1-binary.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/6.4.2-binary.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Mon Aug
8 23:24:35 2011 (r28407)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Tue Aug
9 07:41:10 2011 (r28408)
@@ -1,6 +1,10 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
-assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" ||
stdenv.system == "i686-linux";
+let
+ supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
+in
+
+assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "6.10.1";
@@ -100,5 +104,5 @@
[ $(./main) == "yes" ]
'';
- meta.platforms = stdenv.lib.platforms.haskellPlatforms;
+ meta.platforms = supportedPlatforms;
}
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2-binary.nix Mon Aug
8 23:24:35 2011 (r28407)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2-binary.nix Tue Aug
9 07:41:10 2011 (r28408)
@@ -1,6 +1,10 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
-assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" ||
stdenv.system == "i686-linux";
+let
+ supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
+in
+
+assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "6.10.2";
@@ -99,4 +103,5 @@
[ $(./main) == "yes" ]
'';
+ meta.platforms = supportedPlatforms;
}
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.12.1-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.12.1-binary.nix Mon Aug
8 23:24:35 2011 (r28407)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.12.1-binary.nix Tue Aug
9 07:41:10 2011 (r28408)
@@ -1,6 +1,10 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
-assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" ||
stdenv.system == "i686-linux";
+let
+ supportedPlatforms = ["x86_64-linux" "i686-linux"];
+in
+
+assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "6.12.1";
@@ -101,4 +105,5 @@
[ $(./main) == "yes" ]
'';
+ meta.platforms = supportedPlatforms;
}
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.4.2-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.4.2-binary.nix Mon Aug
8 23:24:35 2011 (r28407)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.4.2-binary.nix Tue Aug
9 07:41:10 2011 (r28408)
@@ -1,6 +1,10 @@
{stdenv, fetchurl, perl, readline, ncurses, gmp}:
-assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" ||
stdenv.system == "i686-linux";
+let
+ supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
+in
+
+assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation {
name = if stdenv.system == "i686-darwin" then "ghc-6.6.1-binary" else
"ghc-6.4.2-binary";
@@ -64,4 +68,5 @@
'' else "";
+ meta.platforms = supportedPlatforms;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
