[PATCH nixpkgs 1/1] python3Packages.pygraphviz: 1.6 -> 1.7
Export this patch
The patch that added graphviz to the PATH was ported to 1.7.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
.../python-modules/pygraphviz/default.nix | 4 ++--
.../pygraphviz/graphviz-path.patch | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index e9b66a95771..1406462933b 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "pygraphviz";
- version = "1.6";
+ version = "1.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860";
+ sha256 = "0113vc62xapcghw5yv1mz5n10nfnmxsz0ncci5j1xkrpkxhcdgm7";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
index e4ff925009d..02e3e6d8348 100644
--- a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
+++ b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
@@ -1,13 +1,13 @@
diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
-index 8f72024..2d8358e 100644
+index d539ba0..10f6467 100644
--- a/pygraphviz/agraph.py
+++ b/pygraphviz/agraph.py
-@@ -1557,7 +1557,7 @@ class AGraph(object):
- import os
- import glob
+@@ -1792,7 +1792,7 @@ class AGraph:
+ if platform.system() == "Windows":
+ name += ".exe"
- paths = os.environ["PATH"]
-+ paths = '@graphviz@/bin:' + os.environ["PATH"]
- if os.name == "nt":
- exe = ".exe"
- else:
++ paths = '@graphviz@/bin' + os.environ["PATH"]
+ for path in paths.split(os.pathsep):
+ match = glob.glob(os.path.join(path, name))
+ if match:
--
2.29.2