diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 16:11:22 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 16:11:22 +0100 |
commit | 8cbb718fa397054e13469bb6faef33b6586be603 (patch) | |
tree | f9414482da87f41960c6d6d70b87a1cb0d004dcc | |
parent | 77b098e610ac9c70ddaa7caaff8a2472e1cad7e6 (diff) | |
download | nixlib-8cbb718fa397054e13469bb6faef33b6586be603.tar nixlib-8cbb718fa397054e13469bb6faef33b6586be603.tar.gz nixlib-8cbb718fa397054e13469bb6faef33b6586be603.tar.bz2 nixlib-8cbb718fa397054e13469bb6faef33b6586be603.tar.lz nixlib-8cbb718fa397054e13469bb6faef33b6586be603.tar.xz nixlib-8cbb718fa397054e13469bb6faef33b6586be603.tar.zst nixlib-8cbb718fa397054e13469bb6faef33b6586be603.zip |
python.pkgs.networkx: move expression
-rw-r--r-- | pkgs/development/python-modules/networkx/default.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 26 |
2 files changed, 35 insertions, 25 deletions
diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix new file mode 100644 index 000000000000..f6fc4139c858 --- /dev/null +++ b/pkgs/development/python-modules/networkx/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, 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; + + src = fetchPypi { + inherit pname version; + sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; + }; + + 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d48551b2581c..13189b0df907 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20941,31 +20941,7 @@ EOF }; }; - networkx = buildPythonPackage rec { - version = "1.11"; - name = "networkx-${version}"; - - # Currently broken on PyPy. - # https://github.com/networkx/networkx/pull/1361 - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/networkx/${name}.tar.gz"; - sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ 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 = licenses.bsd3; - }; - }; + networkx = callPackage ../development/python-modules/networkx { }; ofxclient = callPackage ../development/python-modules/ofxclient {}; |