diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index 947f4a90b0fa..77c4811a8ec0 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -1,50 +1 @@ -{ - lib, - fetchFromGitHub, - python3, - testers, - mcdreforged, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "mcdreforged"; - version = "2.13.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "MCDReforged"; - repo = "MCDReforged"; - tag = "v${version}"; - hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; - }; - - build-system = [ python3.pkgs.setuptools ]; - - dependencies = with python3.pkgs; [ - colorama - colorlog - packaging - parse - prompt-toolkit - psutil - requests - resolvelib - ruamel-yaml - typing-extensions - ]; - - nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; - - passthru.tests = { - version = testers.testVersion { package = mcdreforged; }; - }; - - meta = { - description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; - homepage = "https://mcdreforged.com"; - changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ moraxyc ]; - mainProgram = "mcdreforged"; - }; -} +{ python3Packages }: with python3Packages; toPythonApplication mcdreforged diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix new file mode 100644 index 000000000000..5797bd47e7f7 --- /dev/null +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -0,0 +1,67 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + colorama, + colorlog, + packaging, + parse, + prompt-toolkit, + psutil, + requests, + resolvelib, + ruamel-yaml, + typing-extensions, + pathspec, + pytestCheckHook, + versionCheckHook, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "mcdreforged"; + version = "2.14.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MCDReforged"; + repo = "MCDReforged"; + tag = "v${version}"; + hash = "sha256-R9zM86ohABEaxj7NYj8FCPIYsMDJp0sKjOhWzit69B8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colorama + colorlog + packaging + parse + prompt-toolkit + psutil + requests + resolvelib + ruamel-yaml + typing-extensions + pathspec + ]; + + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + ]; + + versionCheckProgramArg = [ "--version" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; + homepage = "https://mcdreforged.com"; + changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "mcdreforged"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28d259902c93..44754b734535 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7994,6 +7994,8 @@ self: super: with self; { mccabe = callPackage ../development/python-modules/mccabe { }; + mcdreforged = callPackage ../development/python-modules/mcdreforged { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; mcuuid = callPackage ../development/python-modules/mcuuid { };