diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-02-22 09:17:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 09:17:40 +0000 |
| commit | 743a33a6be74e759e049dd6706a25fd095973310 (patch) | |
| tree | 42a191a014d9e2652f9e9edb22fd9266c5775197 /pkgs/development/python-modules/networkx | |
| parent | 54ac74c5586e6ab75727e8f1415ae232ca96a3fa (diff) | |
| parent | 198bdf39b6b61e86cc9a50507e47e575aaf93e82 (diff) | |
| download | nixlib-743a33a6be74e759e049dd6706a25fd095973310.tar nixlib-743a33a6be74e759e049dd6706a25fd095973310.tar.gz nixlib-743a33a6be74e759e049dd6706a25fd095973310.tar.bz2 nixlib-743a33a6be74e759e049dd6706a25fd095973310.tar.lz nixlib-743a33a6be74e759e049dd6706a25fd095973310.tar.xz nixlib-743a33a6be74e759e049dd6706a25fd095973310.tar.zst nixlib-743a33a6be74e759e049dd6706a25fd095973310.zip | |
Merge pull request #35198 from dotlambda/python
python: updates and fixes
Diffstat (limited to 'pkgs/development/python-modules/networkx')
| -rw-r--r-- | pkgs/development/python-modules/networkx/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index f6fc4139c858..3388aef9cef1 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -3,32 +3,24 @@ , fetchPypi , nose , decorator -, isPy36 -, isPyPy }: buildPythonPackage rec { pname = "networkx"; - version = "1.11"; - - # Currently broken on PyPy. - # https://github.com/networkx/networkx/pull/1361 - disabled = isPyPy; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; + extension = "zip"; + sha256 = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1"; }; checkInputs = [ nose ]; propagatedBuildInputs = [ decorator ]; - # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 - doCheck = !(isPy36); - meta = { homepage = "https://networkx.github.io/"; description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} |