Author: ludo
Date: Sun Jan 23 22:48:08 2011
New Revision: 25677
URL: https://svn.nixos.org/websvn/nix/?rev=25677&sc=1

Log:
GNU Automake 1.11.x: Disable tests on Solaris.

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Sun Jan 23 21:04:12 
2011        (r25676)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Sun Jan 23 22:48:08 
2011        (r25677)
@@ -2468,7 +2468,9 @@
   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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to