mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge pull request #34864 from ciderale/py3k-graph-tool-update
graph-tool: 2.16 -> 2.26
This commit is contained in:
commit
db8d8ac31e
@ -1,9 +1,11 @@
|
||||
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
|
||||
pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
|
||||
gobjectIntrospection, pygobject3, gtk3, matplotlib }:
|
||||
gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
|
||||
buildPythonPackage }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.16";
|
||||
buildPythonPackage rec {
|
||||
format = "other";
|
||||
version = "2.26";
|
||||
name = "${python.libPrefix}-graph-tool-${version}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -16,16 +18,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
|
||||
sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p";
|
||||
sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-python-module-path=$(out)/${python.sitePackages}"
|
||||
"--with-boost-libdir=${boost}/lib"
|
||||
"--with-expat=${expat}"
|
||||
"--with-cgal=${cgal}"
|
||||
"--enable-openmp"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boost
|
||||
|
@ -7389,9 +7389,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
# py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
|
||||
graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
|
||||
else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };
|
||||
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { };
|
||||
|
||||
grappelli_safe = buildPythonPackage rec {
|
||||
version = "0.3.13";
|
||||
|
Loading…
Reference in New Issue
Block a user