diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:18:43 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:18:43 +0100 |
commit | a510aa2672dae525c1eb152f00fd0e6f8eb10f39 (patch) | |
tree | ee9b7efb3ca8049b84de1070e3cd2704c109f0f9 /pkgs/development/python-modules/docutils | |
parent | 077b7e5880628c12fe6a9ae0b10db848deb85b50 (diff) | |
parent | e869896d00d9c7b1485b15e891d21213b4ff97f0 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/docutils')
-rw-r--r-- | pkgs/development/python-modules/docutils/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index c2aced4e45e4a..f427f95ffaa92 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchurl , buildPythonPackage , isPy3k @@ -14,9 +15,13 @@ buildPythonPackage rec { sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji"; }; - checkPhase = '' - LANG="en_US.UTF-8" ${python.interpreter} ${if isPy3k then "test3/alltests.py" else "test/alltests.py"} - ''; + # Only Darwin needs LANG, but we could set it in general. + # It's done here conditionally to prevent mass-rebuilds. + checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" '' + (if isPy3k then '' + ${python.interpreter} test3/alltests.py + '' else '' + ${python.interpreter} test/alltests.py + ''); # Create symlinks lacking a ".py" suffix, many programs depend on these names postFixup = '' |