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

python3.pkgs.graph-tool: 2.27 -> 2.29

Browse Source 
The dependency 'pkg-config' was renamed and the two patches have since been
included or resolved.
This commit is contained in:
Michel Weitbrecht 2019-12-25 17:48:03 +01:00 committed by Lassulus
parent 88810a55bf
commit d38c4638ee
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/python-modules/graph-tool/2.x.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr
, pkg-config, boost, expat, scipy, cgal, gmp, mpfr
, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
, buildPythonPackage
, fetchpatch
@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "graph-tool";
format = "other";
version = "2.27";
version = "2.29";
meta = with stdenv.lib; {
description = "Python module for manipulation and statistical analysis of graphs";
@ -21,25 +21,9 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27";
sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c";
};
patches = [
# fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509)
(fetchpatch {
name = "cgal-4.13.patch";
url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch";
sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m";
})
] ++ (lib.optionals (pythonAtLeast "3.7") [
# # python 3.7 compatibility (`async` is now reserved)
(fetchpatch {
name = "async-reserved.patch";
url = "https://git.skewed.de/count0/graph-tool/commit/0407f41a35b6be7c670927fb5dc578cbd0e88be4.patch";
sha256 = "1fklznhmfvbb3ykwzyf8p2hiczby6y7r0xnkkjl2jkxlvr24000q";
})
]);
configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
"--with-boost-libdir=${boost}/lib"
@ -48,7 +32,7 @@ buildPythonPackage rec {
"--enable-openmp"
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ ncurses ];
propagatedBuildInputs = [

2
pkgs/top-level/python-packages.nix
View File

@ -3408,7 +3408,7 @@ in {
wtf-peewee = callPackage ../development/python-modules/wtf-peewee { };
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix {
inherit (pkgs) pkgconfig;
inherit (pkgs) pkg-config;
};
grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };