Unverified Commit d8594e0e authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #288639 from dotlambda/igraph-0.10.10 

igraph: 0.10.9 -> 0.10.10
parents 8252184b cfdc4dc0

pkgs/development/libraries/igraph/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/python-modules/igraph/default.nix

+23 −6
Original line number Diff line number Diff line
@@ -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" ];