Merge pull request #66966 from jonringer/bump-pydot-ng

pythonPackages.pydot_ng: fix build
This commit is contained in:
Marek Mahut 2019-08-23 08:21:59 +02:00 committed by GitHub
commit 611fbf7206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions

View File

@ -1,10 +1,9 @@
{ stdenv
, buildPythonPackage
, fetchPypi
{ lib, buildPythonPackage, fetchPypi, isPy27
, graphviz
, mock
, pyparsing
, pytest
, unittest2
, pkgs
}:
buildPythonPackage rec {
@ -16,19 +15,22 @@ buildPythonPackage rec {
sha256 = "8c8073b97aa7030c28118961e2c6c92f046e4cb57aeba7df87146f7baa6530c5";
};
buildInputs = [ pytest unittest2 ];
propagatedBuildInputs = [ pkgs.graphviz pyparsing ];
propagatedBuildInputs = [ graphviz pyparsing ];
checkInputs = [
graphviz
mock
pytest
] ++ lib.optionals isPy27 [ unittest2];
checkPhase = ''
mkdir test/my_tests
py.test test
pytest
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://pypi.python.org/pypi/pydot-ng";
description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot";
license = licenses.mit;
maintainers = [ maintainers.bcdarwin ];
maintainers = with maintainers; [ bcdarwin jonringer ];
};
}

View File

@ -4315,7 +4315,7 @@ in {
inherit (pkgs) graphviz;
};
pydot_ng = callPackage ../development/python-modules/pydot_ng { };
pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; };
pyelftools = callPackage ../development/python-modules/pyelftools { };