From 64a24d3f9ad6b478c5ab61e526ec5dedea1ac0cc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:49:18 -0400 Subject: [PATCH] pythonPackages.dot2tex: refactor move to python-modules --- .../python-modules/dot2tex/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/dot2tex/default.nix diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix new file mode 100644 index 00000000000..9d644c22eaf --- /dev/null +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, pyparsing +}: + +buildPythonPackage rec { + pname = "dot2tex"; + version = "2.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; + }; + + # Tests fail with 3.x. Furthermore, package is no longer maintained. + disabled = isPy3k; + + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; + homepage = "https://github.com/kjellmf/dot2tex"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d0744c996b..68df3ed5da0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4449,27 +4449,7 @@ in { jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - dot2tex = buildPythonPackage rec { - name = "dot2tex-2.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dot2tex/dot2tex-2.9.0.tar.gz"; - sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; - }; - - # Tests fail with 3.x. Furthermore, package is no longer maintained. - disabled = isPy3k; - - propagatedBuildInputs = with self; [ - pyparsing - ]; - - meta = { - description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; - homepage = "https://github.com/kjellmf/dot2tex"; - license = licenses.mit; - }; - }; + dot2tex = callPackage ../development/python-modules/dot2tex { }; poezio = callPackage ../applications/networking/instant-messengers/poezio { };