Author: simons
Date: Mon Aug 16 17:03:19 2010
New Revision: 23193
URL: https://svn.nixos.org/websvn/nix/?rev=23193&sc=1

Log:
pkgs/top-level/all-packages.nix: disable doCheck for setuptools when run with 
Python 2.7

The regression test suite fails with the following error:

  ======================================================================
  FAIL: test_get_script_header_jython_workaround 
(setuptools.tests.test_resources.ScriptHeaderTests)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File 
"/tmp/nix-build-0zz04maf217x7a6fq18ccmx5s1mrijlr-setuptools-0.6c11.drv-0/setuptools-0.6c11/setuptools/tests/test_resources.py",
 line 524, in test_get_script_header_jython_workaround
      self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
  AssertionError: False is not True

I'm not sure yet what the problem is.

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       Mon Aug 16 13:23:45 
2010        (r23192)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Aug 16 17:03:19 
2010        (r23193)
@@ -3955,7 +3955,7 @@
   buildPython27Package = import ../development/python-modules/generic {
     inherit makeWrapper lib;
     python = python27;
-    setuptools = setuptools.override { python = python27; };
+    setuptools = setuptools.override { python = python27; doCheck = false; };
   };
 
   pythonPackages = python26Packages;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to