about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/worldengine
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-11 23:37:02 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-11 23:41:30 +0000
commit6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch)
tree035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/python-modules/worldengine
parentda7500bc026e937ac7fce7b50f67a0e1765737a7 (diff)
parente4134747f5666bcab8680aff67fa3b63384f9a0f (diff)
downloadnixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar
nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz
nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2
nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz
nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz
nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst
nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/worldengine')
-rw-r--r--nixpkgs/pkgs/development/python-modules/worldengine/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
index 103e2fc8defd..81c09bf74253 100644
--- a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , pythonOlder
+, isPy27
 , fetchFromGitHub
 , nose
 , noise
@@ -48,6 +49,7 @@ buildPythonPackage rec {
 
   # with python<3.5, unittest fails to discover tests because of their filenames
   # so nose is used instead.
+  doCheck = !isPy27; # google namespace clash
   checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ];
   postCheck = stdenv.lib.optionalString (pythonOlder "3.5") ''
     nosetests tests