public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91473 from MostAwesomeDude/igraph

Browse Source 
igraph: 0.7.1 -> 0.8.2
This commit is contained in:
Maximilian Bosch 2020-06-28 01:02:51 +02:00 committed by GitHub
commit d7e227073d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/igraph/default.nix
View File

@ -4,28 +4,34 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igraph"; pname = "igraph";
version = "0.7.1"; version = "0.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "igraph"; owner = "igraph";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ flex yacc zlib libxml2 ]; buildInputs = [ flex yacc zlib libxml2 ];
# This file is normally generated by igraph's bootstrap.sh, but we can do it # Normally, igraph wants us to call bootstrap.sh, which will call
# ourselves. ~ C. # 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 = '' postPatch = ''
echo "${version}" > VERSION echo "${version}" > IGRAPH_VERSION
''; '';
doCheck = true;
meta = { meta = {
description = "The network analysis package"; description = "The network analysis package";
homepage = "https://igraph.org/"; homepage = "https://igraph.org/";
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
# NB: Known to fail tests on aarch64.
platforms = [ "x86_64-linux" ];
maintainers = [ lib.maintainers.MostAwesomeDude ]; maintainers = [ lib.maintainers.MostAwesomeDude ];
}; };
} }

9
pkgs/development/python-modules/python-igraph/default.nix
View File

@ -1,5 +1,6 @@
{ buildPythonPackage, fetchPypi, lib, isPy3k { buildPythonPackage, fetchPypi, lib, isPy3k
, pkgconfig, igraph }: , pkgconfig, igraph
, texttable }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-igraph"; pname = "python-igraph";
@ -7,12 +8,18 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ igraph ]; buildInputs = [ igraph ];
propagatedBuildInputs = [ texttable ];
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72"; sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72";
}; };
# 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" ];
doCheck = !isPy3k; doCheck = !isPy3k;
meta = { meta = {