From a246bebc14f54e7a2f428464ba2cba2cc79b26bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 23 Jan 2011 22:48:08 +0000 Subject: [PATCH] GNU Automake 1.11.x: Disable tests on Solaris. svn path=/nixpkgs/trunk/; revision=25677 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58392d4a058b..564b3e9eb92d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2468,7 +2468,9 @@ let automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { - doCheck = if stdenv.isArm then false else true; + doCheck = !stdenv.isArm + # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. + && stdenv.system != "i386-sunos"; }; avrdude = callPackage ../development/tools/misc/avrdude { };