diff options
Diffstat (limited to 'pkgs/development/python-modules/mahotas/default.nix')
-rw-r--r-- | pkgs/development/python-modules/mahotas/default.nix | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 6926cc0e6958f..144aae89c79d4 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,30 +1,28 @@ -{ buildPythonPackage -, fetchFromGitHub -, fetchpatch -, pillow -, scipy -, numpy -, pytestCheckHook -, imread -, freeimage -, lib -, stdenv +{ + buildPythonPackage, + fetchFromGitHub, + pillow, + scipy, + numpy, + pytestCheckHook, + imread, + lib, + stdenv, }: buildPythonPackage rec { pname = "mahotas"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; - rev = "v${version}"; - hash = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w="; + rev = "refs/tags/v${version}"; + hash = "sha256-9tjk3rhcfAYROZKwmwHzHAN7Ui0EgmxPErQyF//K0r8="; }; propagatedBuildInputs = [ - freeimage imread numpy pillow @@ -33,16 +31,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace mahotas/io/freeimage.py \ - --replace "ctypes.util.find_library('freeimage')" 'True' \ - --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' - ''; - # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-std=c++14"; - }; + env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-std=c++14"; }; # tests must be run in the build directory preCheck = '' @@ -57,10 +47,7 @@ buildPythonPackage rec { "test_haralick3d" ]; - pythonImportsCheck = [ - "mahotas" - "mahotas.freeimage" - ]; + pythonImportsCheck = [ "mahotas" ]; disabled = stdenv.isi686; # Failing tests |