diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index b0017e03ebc7..55915b4bb523 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-Iaez6Rrd684vsraCkEH5a16rXfc53MyPXcYf3sOcaOY="; + hash = "sha256-xFX48qAr0x0iNRns/aGH9UKL0wGJyfccQLdEXUFI/TU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 4aebfc1cecd1..e2f555121f93 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -3,24 +3,28 @@ , pythonOlder , fetchFromGitHub , pkg-config +, setuptools , igraph , texttable -, unittestCheckHook +, cairocffi +, matplotlib +, plotly +, pytestCheckHook }: buildPythonPackage rec { pname = "igraph"; - version = "0.11.3"; + version = "0.11.4"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-Pki0ygcQeuC5E4SwhzGX7oIe9LUSgoBKiXbtcpjL3ng="; + hash = "sha256-sR9OqsBxP2DvcYz1dhIP29rrQ56CRKW02oNAXUNttio="; }; postPatch = '' @@ -29,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + setuptools ]; buildInputs = [ @@ -39,13 +44,25 @@ buildPythonPackage rec { texttable ]; + passthru.optional-dependencies = { + cairo = [ cairocffi ]; + matplotlib = [ matplotlib ]; + plotly = [ plotly ]; + plotting = [ cairocffi ]; + }; + # NB: We want to use our igraph, not vendored igraph, but even with # pkg-config on the PATH, their custom setup.py still needs to be explicitly # told to do it. ~ C. - setupPyGlobalFlags = [ "--use-pkg-config" ]; + env.IGRAPH_USE_PKG_CONFIG = true; nativeCheckInputs = [ - unittestCheckHook + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + disabledTests = [ + "testAuthorityScore" + "test_labels" ]; pythonImportsCheck = [ "igraph" ];