From eb642f80f9aecc19312909e08601a3c2020b5ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Aug 2022 11:37:14 +0000 Subject: [PATCH] m2r: use toPythonApplication --- .../python-modules/m2r/default.nix | 2 +- pkgs/tools/text/m2r/default.nix | 32 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 pkgs/tools/text/m2r/default.nix diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index fa9fdbe91bde0..d85c2196e8433 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ AndersonTorres SuperSandro2000 ]; # https://github.com/miyakogi/m2r/issues/66 broken = versionAtLeast mistune.version "2"; }; diff --git a/pkgs/tools/text/m2r/default.nix b/pkgs/tools/text/m2r/default.nix deleted file mode 100644 index f6dda712d0b98..0000000000000 --- a/pkgs/tools/text/m2r/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, docutils -, mistune -, pygments -}: - -buildPythonApplication rec { - pname = "m2r"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "miyakogi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JNLPEXMoiISh4RnKP+Afj9/PJp9Lrx9UYHsfuGAL7uI="; - }; - - buildInputs = [ - docutils - mistune - pygments - ]; - - meta = with lib; { - homepage = "https://github.com/miyakogi/m2r"; - description = "Markdown-to-RestructuredText converter"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49e80f87a12ff..748bcbdcffe50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8076,7 +8076,7 @@ with pkgs; mcfly = callPackage ../tools/misc/mcfly { }; - m2r = python3Packages.callPackage ../tools/text/m2r { }; + m2r = with python3Packages; toPythonApplication m2r; md2gemini = with python3.pkgs; toPythonApplication md2gemini;