Skip to content

Commit

Permalink
Disable test for setuptools on darwin, and add darwin to supported pl…
Browse files Browse the repository at this point in the history
…atforms for serf. This should make nodejs working on darwin again
  • Loading branch information
Sander van der Burg committed Jan 6, 2014
1 parent 4fbb9e2 commit ad8974f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/libraries/serf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ stdenv.mkDerivation {
description = "HTTP client library based on APR";
license = stdenv.lib.licenses.asl20 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/setuptools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
'';

doCheck = true;
doCheck = stdenv.system != "x86_64-darwin";

checkPhase = ''
${python}/bin/${python.executable} setup.py test
Expand Down

3 comments on commit ad8974f

@domenkozar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have output why tests fail?

@svanderburg
Copy link
Member

@svanderburg svanderburg commented on ad8974f Jan 6, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domenkozar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you try running it with export LANG=en_US.UTF-8 as preCheck phase?

Please sign in to comment.