pythonPackages.dynd: refactor move to python-modules

This commit is contained in:
Chris Ostrouchov 2018-10-17 14:30:06 -04:00 committed by Frederik Rietdijk
parent 5934b25cb0
commit f320b8456b
2 changed files with 44 additions and 32 deletions

View File

@ -0,0 +1,43 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPyPy
, isPy3k
, cython
, numpy
, pkgs
}:
buildPythonPackage rec {
version = "0.7.2";
pname = "dynd";
disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11
src = pkgs.fetchFromGitHub {
owner = "libdynd";
repo = "dynd-python";
rev = "v${version}";
sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
};
# setup.py invokes git on build but we're fetching a tarball, so
# can't retrieve git version. We hardcode:
preConfigure = ''
substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"
substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
'';
# Python 3 works but has a broken import test that I couldn't
# figure out.
doCheck = !isPy3k;
buildInputs = [ pkgs.cmake pkgs.libdynd.dev cython ];
propagatedBuildInputs = [ numpy pkgs.libdynd ];
meta = with stdenv.lib; {
homepage = http://libdynd.org;
license = licenses.bsd2;
description = "Python exposure of dynd";
maintainers = with maintainers; [ teh ];
};
}

View File

@ -2968,38 +2968,7 @@ in {
nwdiag = callPackage ../development/python-modules/nwdiag { };
dynd = buildPythonPackage rec {
version = "0.7.2";
name = "dynd-${version}";
disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11
src = pkgs.fetchFromGitHub {
owner = "libdynd";
repo = "dynd-python";
rev = "v${version}";
sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
};
# setup.py invokes git on build but we're fetching a tarball, so
# can't retrieve git version. We hardcode:
preConfigure = ''
substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"
substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
'';
# Python 3 works but has a broken import test that I couldn't
# figure out.
doCheck = !isPy3k;
buildInputs = with pkgs; [ cmake libdynd.dev self.cython ];
propagatedBuildInputs = with self; [ numpy pkgs.libdynd ];
meta = {
homepage = http://libdynd.org;
license = licenses.bsd2;
description = "Python exposure of dynd";
maintainers = with maintainers; [ teh ];
};
};
dynd = callPackage ../development/python-modules/dynd { };
langcodes = callPackage ../development/python-modules/langcodes { };