From 631ea038757bd88e55c10ec9b1aa1d2aee1af05f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Feb 2010 14:13:25 +0000
Subject: [PATCH] * Fix / disable some packages that give evaluation errors in
 Hydra.

svn path=/nixpkgs/trunk/; revision=19833
---
 pkgs/applications/misc/grip/default.nix       |  2 +-
 pkgs/applications/misc/hello/ex-2/default.nix |  4 ++--
 pkgs/development/compilers/ghc/6.12.1.nix     |  2 +-
 pkgs/games/jamp/default.nix                   |  7 ++----
 pkgs/lib/platforms.nix                        |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 pkgs/top-level/release.nix                    | 24 +++++--------------
 7 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index f6c43a05c3e6..a82715fc13cd 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
     homepage = http://nostatic.org/grip;
     license = "GPLv2";
     maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    #platforms = args.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index 876e0dfb7c50..409ff3745c1c 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "hello-2.3";
+  name = "hello-2.3x26";
   
   src = fetchurl {
     url = mirror://gnu/hello/hello-2.3.tar.bz2;
     sha256 = "0c7vijq8y68bpr7g6dh1gny0bff8qq81vnp4ch8pjzvg56wb3js1";
   };
-  
+
   meta = {
     description = "A program that produces a familiar, friendly greeting";
     longDescription = ''
diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix
index 3412cc771ac3..b54001a70eaf 100644
--- a/pkgs/development/compilers/ghc/6.12.1.nix
+++ b/pkgs/development/compilers/ghc/6.12.1.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
     maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 
 
diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix
index b551b9b6dfce..d9ae4ca738b7 100644
--- a/pkgs/games/jamp/default.nix
+++ b/pkgs/games/jamp/default.nix
@@ -24,10 +24,7 @@ rec {
       
   meta = {
     description = "A physics-based game";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms; 
-      linux ++ darwin;
+    maintainers = [ a.lib.maintainers.raskin ];
+    platforms = a.lib.platforms.linux;
   };
 }
diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix
index d8f9692ae094..5174476f9548 100644
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@@ -11,5 +11,5 @@ rec {
   unix = linux ++ darwin ++ freebsd ++ openbsd;
   all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
   allBut = platform: lists.filter (x: platform != x) all;
-  mesaPlatforms = linux ++ darwin ++ freebsd;
+  mesaPlatforms = linux;
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b55c101167aa..7b08c048fe5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -369,7 +369,7 @@ rec {
       license = "GPLv2+";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = python.meta.platforms;
+      platforms = stdenv.lib.platforms.linux;
     };
   });
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 8eaaeeed9435..6b07a54a5127 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -67,7 +67,7 @@ let
         else [];
 
   /* Common platform groups on which to test packages. */
-  inherit (pkgs.lib.platforms) linux darwin cygwin allBut all;
+  inherit (pkgs.lib.platforms) linux darwin cygwin allBut all mesaPlatforms;
 
   /* Platform groups for specific kinds of applications. */
   x11Supported = linux;
@@ -119,7 +119,7 @@ in {
   cksfv = all;
   classpath = linux;
   cmake = all;
-  compiz = linux;
+  #compiz = linux;
   consolekit = linux;
   coreutils = all;
   cpio = all;
@@ -174,7 +174,7 @@ in {
   ghostscriptX = linux;
   gimp = linux;
   git = linux;
-  gitFull = linux;
+  #gitFull = linux;
   glibc = linux;
   glibcLocales = linux;
   glxinfo = linux;
@@ -264,7 +264,7 @@ in {
   mcron = linux;
   mdadm = linux;
   mercurial = allBut "i686-cygwin";
-  mesa = linux ++ darwin;
+  mesa = mesaPlatforms;
   midori = linux;
   mingetty = linux;
   mk = linux;
@@ -322,7 +322,7 @@ in {
   python = allBut "i686-cygwin";
   pythonFull = linux;
   sbcl = all;
-  qt3 = allBut "i686-cygwin";
+  qt3 = linux;
   qt4 = linux;
   qt45 = linux;
   qt46 = linux;
@@ -408,7 +408,7 @@ in {
   wireshark = linux;
   wirelesstools = linux;
   wpa_supplicant = linux;
-  wxGTK = all;
+  wxGTK = linux;
   x11_ssh_askpass = linux;
   xchm = linux;
   xfig = x11Supported;
@@ -472,10 +472,6 @@ in {
     gtk = linux;
   };
 
-  haskellPackages_ghc683 = {
-    ghc = ghcSupported;
-  };
-
   haskellPackages_ghc6102 = {
     ghc = ghcSupported;
   };
@@ -570,14 +566,6 @@ in {
     kernel = linux;
   };
 
-  kernelPackages_2_6_31_zen = {
-    kernel = linux;
-  };
-
-  kernelPackages_2_6_31_zen_bfs = {
-    kernel = linux;
-  };
-
   kernelPackages_2_6_32 = {
     aufs = linux;
     kernel = linux;