diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix new file mode 100644 index 000000000000..8d8fbf7a7cef --- /dev/null +++ b/pkgs/development/python-modules/dynd/default.nix @@ -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 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa1389999539..935b79ab21cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };