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

Merge pull request #34864 from ciderale/py3k-graph-tool-update

Browse Source 
graph-tool: 2.16 -> 2.26
This commit is contained in:
Matthew Justin Bauer 2018-04-09 14:24:07 -05:00 committed by GitHub
commit db8d8ac31e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,11 @@
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
gobjectIntrospection, pygobject3, gtk3, matplotlib }: gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
buildPythonPackage }:
stdenv.mkDerivation rec { buildPythonPackage rec {
version = "2.16"; format = "other";
version = "2.26";
name = "${python.libPrefix}-graph-tool-${version}"; name = "${python.libPrefix}-graph-tool-${version}";
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -16,16 +18,19 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
}; };
configureFlags = [ configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}" "--with-python-module-path=$(out)/${python.sitePackages}"
"--with-boost-libdir=${boost}/lib"
"--with-expat=${expat}"
"--with-cgal=${cgal}"
"--enable-openmp" "--enable-openmp"
]; ];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ ]; buildInputs = [ ncurses ];
propagatedBuildInputs = [ propagatedBuildInputs = [
boost boost

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

@ -7389,9 +7389,7 @@ in {
}; };
}; };
# py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067 graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { };
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; };
grappelli_safe = buildPythonPackage rec { grappelli_safe = buildPythonPackage rec {
version = "0.3.13"; version = "0.3.13";