Skip to content

Commit

Permalink
pythonPackages.cython: 0.24.1 -> 0.25.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@FRidh
FRidh committed Dec 3, 2016
1 parent d41e141 commit 4162623
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 21 deletions.
15 changes: 0 additions & 15 deletions pkgs/development/python-modules/cython_test.patch
View file

This file was deleted.

10 changes: 4 additions & 6 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4233,20 +4233,18 @@ in {

cython = buildPythonPackage rec {
name = "Cython-${version}";
version = "0.24.1";
version = "0.25.1";

src = pkgs.fetchurl {
url = "mirror://pypi/C/Cython/${name}.tar.gz";
sha256 = "84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9";
sha256 = "e0941455769335ec5afb17dee36dc3833b7edc2ae20a8ed5806c58215e4b6669";
};

buildInputs = with self; [ pkgs.pkgconfig pkgs.gdb ];
buildInputs = with self; [ pkgs.glibcLocales pkgs.pkgconfig pkgs.gdb ];
# For testing
nativeBuildInputs = with self; [ numpy pkgs.ncurses ];

# cython's testsuite requires npy_isinf to return sign of the infinity, but
# a C99 conformant is only required to return a non zero value
patches = [ ../development/python-modules/cython_test.patch ];
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
Expand Down

4 comments on commit 4162623

@FRidh
Copy link
Member Author

@FRidh FRidh commented on 4162623 Dec 4, 2016

Choose a reason for hiding this comment

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

cc @knedlsepp

I removed the patch since I don't think it is needed anymore, but we do have a failure on Darwin
http://hydra.nixos.org/build/44504961/nixlog/1/raw

@knedlsepp
Copy link
Member

@knedlsepp knedlsepp commented on 4162623 Dec 4, 2016 •
edited

Choose a reason for hiding this comment

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

My findings for everything python+darwin is basically like this:

  • python's distutils stuff has problems calling clang++ for C++ files and calls clang instead. (I think I've also seen situations where clang++ was actually called)
  • Apple's clang is built in a way that it knows about libc++ and compiles the C++ stuff just fine, so cython stuff works in a non-nix setting.
  • nix-clang barfs on C++ because it doesn't know about the libcxx include path.

I'm not sure if we should make nix-clang C++ aware or try to fix the distutils stuff. In any case I've been playing around with this quite a bit without a solution and I would need to send the bat-signal for tips from @copumpkin 🎃

@knedlsepp
Copy link
Member

Choose a reason for hiding this comment

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

Got python27Packages.pandas working by disabling the "test_locale" test. Having problems with python3.5-pandas, because python3.5-Cython is can't find libcxx headers during build ("fatal error: 'complex' file not found")

@knedlsepp
Copy link
Member

Choose a reason for hiding this comment

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

Seems we need https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C%2B%2B.patch for python3.

Please sign in to comment.