diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/python-modules/graphviz | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/graphviz')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/graphviz/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index 6af54cbb6d6d..8f145c13e722 100644 --- a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -3,11 +3,13 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , substituteAll , graphviz , xdg-utils , makeFontsConf , freefont_ttf +, setuptools , mock , pytest , pytest-mock @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "graphviz"; version = "0.20.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -35,6 +37,12 @@ buildPythonPackage rec { inherit graphviz; xdgutils = xdg-utils; }) + # https://github.com/xflr6/graphviz/issues/209 + (fetchpatch { + name = "fix-tests-with-python312.patch"; + url = "https://github.com/xflr6/graphviz/commit/5ce9fc5de4f2284baa27d7a8d68ab0885d032868.patch"; + hash = "sha256-jREPACSc4aoHY3G+39e8Axqajw4eeKkAeVu2s40v1nI="; + }) ]; postPatch = '' @@ -46,6 +54,10 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ mock pytest |