From 1ff8adc940e70470b44a4faa1e1166fd4f804ac3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:46:29 -0400 Subject: [PATCH] pythonPackages.objgraph: refactor move to python-modules --- .../python-modules/objgraph/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/objgraph/default.nix diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix new file mode 100644 index 00000000000..6d26d71141d --- /dev/null +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +, isPyPy +}: + +buildPythonPackage rec { + pname = "objgraph"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a"; + }; + + # Tests fail with PyPy. + disabled = isPyPy; + + propagatedBuildInputs = [pkgs.graphviz]; + + meta = with stdenv.lib; { + description = "Draws Python object reference graphs with graphviz"; + homepage = https://mg.pov.lt/objgraph/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea89c5030ca..8c2af30b11c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2986,26 +2986,7 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = buildPythonPackage rec { - name = "objgraph-${version}"; - version = "2.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/objgraph/${name}.tar.gz"; - sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a"; - }; - - # Tests fail with PyPy. - disabled = isPyPy; - - propagatedBuildInputs = with self; [pkgs.graphviz]; - - meta = { - description = "Draws Python object reference graphs with graphviz"; - homepage = https://mg.pov.lt/objgraph/; - license = licenses.mit; - }; - }; + objgraph = callPackage ../development/python-modules/objgraph { }; odo = callPackage ../development/python-modules/odo { };