From 9409bd0ea644957e943abe3974b82db86bc10e14 Mon Sep 17 00:00:00 2001 From: Corbin Date: Thu, 25 Jun 2020 00:31:54 -0700 Subject: [PATCH] igraph: 0.7.1 -> 0.8.2 Refs #90840. The check phase is now enabled. All tests pass on my machine. I realized while doing this bump that igraph vendors OpenBLAS, ARPACK, and GLPK. We can use our versions instead, and igraph builds successfully, but 34 tests fail. I'm choosing correctness instead of build times. --- pkgs/development/libraries/igraph/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index fcb5e7918d9..6b6924b7d41 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -4,24 +4,28 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; + sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; - # This file is normally generated by igraph's bootstrap.sh, but we can do it - # ourselves. ~ C. + # Normally, igraph wants us to call bootstrap.sh, which will call + # tools/getversion.sh. Instead, we're going to put the version directly + # where igraph wants, and then let autoreconfHook do the rest of the + # bootstrap. ~ C. postPatch = '' - echo "${version}" > VERSION + echo "${version}" > IGRAPH_VERSION ''; + doCheck = true; + meta = { description = "The network analysis package"; homepage = "https://igraph.org/";