Compare commits

...

6 Commits

Author SHA1 Message Date
Michael Daniels
f81eb0b260 Revert "python3Packages.pygraphviz: unbreak on Darwin"
This reverts commit 5cefe928ee.
2026-07-21 18:58:08 -04:00
nixpkgs-ci[bot]
0cce77b482 Merge master into staging-next 2026-07-21 18:28:46 +00:00
nixpkgs-ci[bot]
d793e2af82 Merge master into staging-next 2026-07-21 12:33:24 +00:00
nixpkgs-ci[bot]
0567cbfd3c Merge master into staging-next 2026-07-21 06:52:24 +00:00
nixpkgs-ci[bot]
34a0c1b8bc Merge master into staging-next 2026-07-21 00:31:59 +00:00
nixpkgs-ci[bot]
7daffa6483 Merge master into staging-next 2026-07-20 18:38:44 +00:00

View File

@@ -3,7 +3,6 @@
buildPythonPackage,
fetchFromGitHub,
replaceVars,
stdenv,
graphviz,
coreutils,
pkg-config,
@@ -12,10 +11,6 @@
pytest,
}:
let
# TODO: remove once #540793 makes it to master
graphviz' = graphviz.override { withQuartz = stdenv.hostPlatform.isDarwin; };
in
buildPythonPackage (finalAttrs: {
pname = "pygraphviz";
version = "2.0";
@@ -32,7 +27,7 @@ buildPythonPackage (finalAttrs: {
# pygraphviz depends on graphviz executables and wc being in PATH
(replaceVars ./path.patch {
path = lib.makeBinPath [
graphviz'
graphviz
coreutils
];
})
@@ -43,19 +38,19 @@ buildPythonPackage (finalAttrs: {
--replace-fail ', "swig>4.1.0"' ""
'';
env.GRAPHVIZ_PREFIX = graphviz';
env.GRAPHVIZ_PREFIX = graphviz;
build-system = [
setuptools
];
nativeBuildInputs = [
graphviz' # for dot
graphviz # for dot
pkg-config
swig
];
buildInputs = [ graphviz' ];
buildInputs = [ graphviz ];
nativeCheckInputs = [ pytest ];