diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
commit | fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74 (patch) | |
tree | fc80390e190e04aeb8330522f475be313feac4b8 /pkgs/development/python-modules/Cython/default.nix | |
parent | 9dfb0b2db04a42815356e6eabba9fac92ccf4cc4 (diff) | |
parent | b9565143eaa17b7b7e03612769ebc6ca24eddae0 (diff) | |
download | nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.gz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.bz2 nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.lz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.xz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.zst nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/python-modules/Cython/default.nix')
-rw-r--r-- | pkgs/development/python-modules/Cython/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index dd403ae5caf6..189468a2daa9 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -11,7 +11,19 @@ , ncurses }: -buildPythonPackage rec { +let + excludedTests = [] + # cython's testsuite is not working very well with libc++ + # We are however optimistic about things outside of testsuite still working + ++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] + # Some tests in the test suite isn't working on aarch64. Disable them for + # now until upstream finds a workaround. + # Upstream issue here: https://github.com/cython/cython/issues/2308 + ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] + ++ stdenv.lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ] + ; + +in buildPythonPackage rec { pname = "Cython"; version = "0.28.3"; @@ -29,12 +41,11 @@ buildPythonPackage rec { buildInputs = [ glibcLocales gdb ]; LC_ALL = "en_US.UTF-8"; - # cython's testsuite is not working very well with libc++ - # We are however optimistic about things outside of testsuite still working checkPhase = '' export HOME="$NIX_BUILD_TOP" ${python.interpreter} runtests.py \ - ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} + ${stdenv.lib.optionalString (builtins.length excludedTests != 0) + ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; meta = { |