JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python3Packages.graphviz: 0.18.1 -> 0.19.1

Browse Source 
https://github.com/xflr6/graphviz/blob/0.19.1/CHANGES.rst
This commit is contained in:
Robert Schütz 2021-12-05 10:23:11 -08:00 committed by Robert Schütz
parent f2b3b7f24a
commit 9b591cb289
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/python-modules/graphviz/default.nix
View File

@ -8,13 +8,14 @@
, makeFontsConf , makeFontsConf
, freefont_ttf , freefont_ttf
, mock , mock
, pytestCheckHook , pytest
, pytest-mock , pytest-mock
, python
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphviz"; pname = "graphviz";
version = "0.18.1"; version = "0.19.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "xflr6"; owner = "xflr6";
repo = "graphviz"; repo = "graphviz";
rev = version; rev = version;
sha256 = "sha256-Y3w9btjYvKfcEQGuAzV+o6edJ9VmVcWhc+ICOqy87uM="; sha256 = "sha256-pE1lsx/r/BjvW5W2niDx/UeRXxx4kvCyHzAUAG3bdGc=";
}; };
patches = [ patches = [
@ -43,10 +44,18 @@ buildPythonPackage rec {
fontDirectories = [ freefont_ttf ]; fontDirectories = [ freefont_ttf ];
}; };
checkInputs = [ mock pytestCheckHook pytest-mock ]; checkInputs = [
mock
pytest
pytest-mock
];
preCheck = '' checkPhase = ''
export HOME=$TMPDIR runHook preCheck
HOME=$TMPDIR ${python.interpreter} run-tests.py
runHook postCheck
''; '';
meta = with lib; { meta = with lib; {

24
pkgs/development/python-modules/graphviz/paths.patch
View File

@ -1,36 +1,36 @@
diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py
index 1e123d1..41e19c2 100644 index 60654bd..2c62b47 100644
--- a/graphviz/backend/dot_command.py --- a/graphviz/backend/dot_command.py
+++ b/graphviz/backend/dot_command.py +++ b/graphviz/backend/dot_command.py
@@ -11,7 +11,7 @@ from . import _common @@ -9,7 +9,7 @@ from .. import parameters
__all__ = ['command']
__all__ = ['DOT_BINARY', 'command']
#: :class:`pathlib.Path` of layout command (``Path('dot')``).
-DOT_BINARY = pathlib.Path('dot') -DOT_BINARY = pathlib.Path('dot')
+DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') +DOT_BINARY = pathlib.Path('@graphviz@/bin/dot')
def command(engine: str, format_: str, *, def command(engine: str, format_: str, *,
diff --git a/graphviz/backend/unflattening.py b/graphviz/backend/unflattening.py diff --git a/graphviz/backend/unflattening.py b/graphviz/backend/unflattening.py
index 5ed25d6..8d2faf8 100644 index a386b8c..883cdc6 100644
--- a/graphviz/backend/unflattening.py --- a/graphviz/backend/unflattening.py
+++ b/graphviz/backend/unflattening.py +++ b/graphviz/backend/unflattening.py
@@ -11,7 +11,7 @@ from . import execute @@ -11,7 +11,7 @@ from . import execute
__all__ = ['unflatten']
#: :class:`pathlib.Path` of unflatten command (``Path('unflatten')``). __all__ = ['UNFLATTEN_BINARY', 'unflatten']
-UNFLATTEN_BINARY = pathlib.Path('unflatten') -UNFLATTEN_BINARY = pathlib.Path('unflatten')
+UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') +UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten')
def unflatten(source: str, @_tools.deprecate_positional_args(supported_number=1)
diff --git a/graphviz/backend/viewing.py b/graphviz/backend/viewing.py diff --git a/graphviz/backend/viewing.py b/graphviz/backend/viewing.py
index 6d4a4d1..2cc6cd8 100644 index fde74a6..6f29b68 100644
--- a/graphviz/backend/viewing.py --- a/graphviz/backend/viewing.py
+++ b/graphviz/backend/viewing.py +++ b/graphviz/backend/viewing.py
@@ -54,7 +54,7 @@ def view_darwin(filepath, *, quiet: bool) -> None: @@ -55,7 +55,7 @@ def view_darwin(filepath: typing.Union[os.PathLike, str], *,
@tools.attach(view, 'freebsd') def view_unixoid(filepath: typing.Union[os.PathLike, str], *,
def view_unixoid(filepath, *, quiet: bool) -> None: quiet: bool) -> None:
"""Open filepath in the user's preferred application (linux, freebsd).""" """Open filepath in the user's preferred application (linux, freebsd)."""
- cmd = ['xdg-open', filepath] - cmd = ['xdg-open', filepath]
+ cmd = ['@xdgutils@/bin/xdg-open', filepath] + cmd = ['@xdgutils@/bin/xdg-open', filepath]