diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-09 14:24:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-09 14:24:07 -0500 |
commit | db8d8ac31e1b8fb74e13ea03f98914746c7b7227 (patch) | |
tree | d3f8bd6e68df957c647f212491ee1fba2c711857 | |
parent | f1c8417ca0bf26e3df2b2150667544b4421a2423 (diff) | |
parent | 83dc28cae2982f6aaa507192a19aff3ef0ff2074 (diff) | |
download | nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.tar nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.tar.gz nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.tar.bz2 nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.tar.lz nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.tar.xz nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.tar.zst nixlib-db8d8ac31e1b8fb74e13ea03f98914746c7b7227.zip |
Merge pull request #34864 from ciderale/py3k-graph-tool-update
graph-tool: 2.16 -> 2.26
-rw-r--r-- | pkgs/development/python-modules/graph-tool/2.x.x.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 8c61a6b278ae..57567a203ea7 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68a5cf0fa217..b6ab13eac3a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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"; |