From 069a168e0cf7d544010b7431e0702bb53b943198 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 12:27:58 +0200
Subject: [PATCH] networkx: 1.9.1 -> 1.10

Update to newer version.
Networkx supports py3k. Currently, networkx is broken on pypy though.
---
 pkgs/top-level/python-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42db423a451..c2dce8edd7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16845,12 +16845,16 @@ let
   };
 
   networkx = buildPythonPackage rec {
-    name = "networkx-1.9.1";
-    disabled = ! isPy27;
+    version = "1.10";
+    name = "networkx-${version}";
 
+    # Currently broken on PyPy. 
+    # https://github.com/networkx/networkx/pull/1361
+    disabled = isPyPy;
+    
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/networkx/networkx-1.9.1.tar.gz";
-      sha256 = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59";
+      url = "https://pypi.python.org/packages/source/n/networkx/${name}.tar.gz";
+      sha256 = "ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8";
     };
 
     propagatedBuildInputs = with self; [ nose decorator ];