From d3df8772c1a3fca0c266038981ca837c866b02f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Aug 2011 07:42:05 +0000 Subject: [PATCH] pkgs/development/compilers/ghc: changed all GHC versions to use re-use the meta.platforms attribute of their bootstrap compiler svn path=/nixpkgs/trunk/; revision=28409 --- pkgs/development/compilers/ghc/6.10.1.nix | 1 + pkgs/development/compilers/ghc/6.10.2.nix | 1 + pkgs/development/compilers/ghc/6.10.3.nix | 1 + pkgs/development/compilers/ghc/6.10.4.nix | 1 + pkgs/development/compilers/ghc/6.11.nix | 1 + pkgs/development/compilers/ghc/6.12.1.nix | 2 +- pkgs/development/compilers/ghc/6.12.2.nix | 2 +- pkgs/development/compilers/ghc/6.12.3.nix | 2 +- pkgs/development/compilers/ghc/6.4.2.nix | 1 + pkgs/development/compilers/ghc/6.6.1.nix | 1 + pkgs/development/compilers/ghc/6.8.2.nix | 1 + pkgs/development/compilers/ghc/6.8.3.nix | 1 + pkgs/development/compilers/ghc/7.0.1.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 +- pkgs/development/compilers/ghc/7.2.1.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 18 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix index 5245a51d1ff0..b53ce9aced37 100644 --- a/pkgs/development/compilers/ghc/6.10.1.nix +++ b/pkgs/development/compilers/ghc/6.10.1.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix index 4a380e715cff..2df43a4c7d75 100644 --- a/pkgs/development/compilers/ghc/6.10.2.nix +++ b/pkgs/development/compilers/ghc/6.10.2.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; passthru = { diff --git a/pkgs/development/compilers/ghc/6.10.3.nix b/pkgs/development/compilers/ghc/6.10.3.nix index 70ce0e37aa89..2ecf35eedfe9 100644 --- a/pkgs/development/compilers/ghc/6.10.3.nix +++ b/pkgs/development/compilers/ghc/6.10.3.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index fdd4fbf18782..53fd1c522168 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; passthru = { diff --git a/pkgs/development/compilers/ghc/6.11.nix b/pkgs/development/compilers/ghc/6.11.nix index f58bddb2ee3a..778b819aa703 100644 --- a/pkgs/development/compilers/ghc/6.11.nix +++ b/pkgs/development/compilers/ghc/6.11.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix index 035c0cd6957e..78a000de309e 100644 --- a/pkgs/development/compilers/ghc/6.12.1.nix +++ b/pkgs/development/compilers/ghc/6.12.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux; + platforms = ghc.meta.platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/6.12.2.nix b/pkgs/development/compilers/ghc/6.12.2.nix index fe39e0dc6fb8..1a48d6cf3183 100644 --- a/pkgs/development/compilers/ghc/6.12.2.nix +++ b/pkgs/development/compilers/ghc/6.12.2.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux; + platforms = ghc.meta.platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 7d23394370d7..bc2d8967cd4b 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux; + platforms = ghc.meta.platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/6.4.2.nix b/pkgs/development/compilers/ghc/6.4.2.nix index 2027042e0ced..c526e5d6cb45 100644 --- a/pkgs/development/compilers/ghc/6.4.2.nix +++ b/pkgs/development/compilers/ghc/6.4.2.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { meta = { description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix index b8be216c8dc6..c54c32bfab0c 100644 --- a/pkgs/development/compilers/ghc/6.6.1.nix +++ b/pkgs/development/compilers/ghc/6.6.1.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation (rec { meta = { description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; postInstall = '' diff --git a/pkgs/development/compilers/ghc/6.8.2.nix b/pkgs/development/compilers/ghc/6.8.2.nix index 4015d364b275..2681f325c929 100644 --- a/pkgs/development/compilers/ghc/6.8.2.nix +++ b/pkgs/development/compilers/ghc/6.8.2.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation (rec { meta = { description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; configureFlags=[ diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix index e3c12cce8c78..b6900321552c 100644 --- a/pkgs/development/compilers/ghc/6.8.3.nix +++ b/pkgs/development/compilers/ghc/6.8.3.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "The Glasgow Haskell Compiler"; + platforms = ghc.meta.platforms; }; configureFlags=[ diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix index 716d61a7be26..db696d2b218c 100644 --- a/pkgs/development/compilers/ghc/7.0.1.nix +++ b/pkgs/development/compilers/ghc/7.0.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux; + platforms = ghc.meta.platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index ca59a8b53116..c0ba5f1fe09c 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.haskellPlatforms; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index b1ecb5a1db68..f6e4d81029a2 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.haskellPlatforms; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index ca3f72f08e43..6f7d802fa0b0 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.haskellPlatforms; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix index a9b7b0ae4891..832cf8cb9319 100644 --- a/pkgs/development/compilers/ghc/7.2.1.nix +++ b/pkgs/development/compilers/ghc/7.2.1.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.haskellPlatforms; + platforms = ghc.meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2f8e83cdd7f6..98a014912379 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = stdenv.lib.platforms.linux; + platforms = ghc.meta.platforms; }; }