summary refs log tree commit diff
path: root/pkgs/top-level/python-packages.nix
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-04-09 14:24:07 -0500
committerGitHub <noreply@github.com>2018-04-09 14:24:07 -0500
commitdb8d8ac31e1b8fb74e13ea03f98914746c7b7227 (patch)
treed3f8bd6e68df957c647f212491ee1fba2c711857 /pkgs/top-level/python-packages.nix
parentf1c8417ca0bf26e3df2b2150667544b4421a2423 (diff)
parent83dc28cae2982f6aaa507192a19aff3ef0ff2074 (diff)
downloadnixlib-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
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r--pkgs/top-level/python-packages.nix4
1 files changed, 1 insertions, 3 deletions
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";