diff options
Diffstat (limited to 'pkgs/development/python-modules/pydot')
-rw-r--r-- | pkgs/development/python-modules/pydot/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch | 16 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index ac965f8404e0..94494842a9d0 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydot"; - version = "1.4.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d"; + sha256 = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; }; propagatedBuildInputs = [ @@ -53,9 +53,8 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_exception_msg" - # Hash mismatch - "test_my_regression_tests" + # broken, fixed after 2.0.0 + "test_graph_with_shapefiles" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch b/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch index e862f1e7c2c3..29c3265f4335 100644 --- a/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch +++ b/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch @@ -1,13 +1,13 @@ -diff --git a/pydot.py b/pydot.py -index 3c7da4d..582c5bc 100644 ---- a/pydot.py -+++ b/pydot.py -@@ -124,7 +124,7 @@ def call_graphviz(program, arguments, working_dir, **kwargs): - 'LD_LIBRARY_PATH': os.environ.get('LD_LIBRARY_PATH', ''), +diff --git a/src/pydot/core.py b/src/pydot/core.py +index 26f526b..78c27f5 100644 +--- a/src/pydot/core.py ++++ b/src/pydot/core.py +@@ -209,7 +209,7 @@ def call_graphviz(program, arguments, working_dir, **kwargs): + "SYSTEMROOT": os.environ.get("SYSTEMROOT", ""), } -- program_with_args = [program, ] + arguments -+ program_with_args = ['@graphviz@/bin/' + program, ] + arguments +- program_with_args = [program] + arguments ++ program_with_args = [f"@graphviz@/bin/{program}"] + arguments process = subprocess.Popen( program_with_args, |