From 1140c2d192ffa605bf93492622e43575e6e0781e Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 15 Dec 2024 21:10:06 +0800 Subject: [PATCH 1/7] mcdreforged: 2.13.2 -> 2.14.0 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.13.2...v2.14.0 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.0 --- pkgs/by-name/mc/mcdreforged/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index 947f4a90b0fa..db9e9d6d98ed 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mcdreforged"; - version = "2.13.2"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { @@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { resolvelib ruamel-yaml typing-extensions + pathspec ]; nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; From 9971588613b5302e677068aeaa8cb5bc222b34ce Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 15 Dec 2024 21:27:47 +0800 Subject: [PATCH 2/7] mcdreforged: move to python-modules --- pkgs/by-name/mc/mcdreforged/package.nix | 52 +-------------- .../python-modules/mcdreforged/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 pkgs/development/python-modules/mcdreforged/default.nix diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index db9e9d6d98ed..77c4811a8ec0 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -1,51 +1 @@ -{ - lib, - fetchFromGitHub, - python3, - testers, - mcdreforged, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "mcdreforged"; - version = "2.14.0"; - 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 - pathspec - ]; - - 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..c9a59aa95b56 --- /dev/null +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -0,0 +1,64 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + colorama, + colorlog, + packaging, + parse, + prompt-toolkit, + psutil, + requests, + resolvelib, + ruamel-yaml, + typing-extensions, + pathspec, + pytestCheckHook, + testers, + mcdreforged, +}: + +buildPythonPackage rec { + pname = "mcdreforged"; + version = "2.14.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MCDReforged"; + repo = "MCDReforged"; + tag = "v${version}"; + hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colorama + colorlog + packaging + parse + prompt-toolkit + psutil + requests + resolvelib + ruamel-yaml + typing-extensions + pathspec + ]; + + nativeCheckInputs = [ 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"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35ec6d5d5012..4139f14e6b22 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 { }; From 5820c2b636f065eb055ec1ab16acc7bdce59cb17 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 15 Dec 2024 21:32:51 +0800 Subject: [PATCH 3/7] python312Packages.mcdreforged: use versionCheckHook --- .../python-modules/mcdreforged/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index c9a59aa95b56..c86318481bcf 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -15,8 +15,7 @@ typing-extensions, pathspec, pytestCheckHook, - testers, - mcdreforged, + versionCheckHook, }: buildPythonPackage rec { @@ -47,11 +46,12 @@ buildPythonPackage rec { pathspec ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + ]; - passthru.tests = { - version = testers.testVersion { package = mcdreforged; }; - }; + versionCheckProgramArg = [ "--version" ]; meta = { description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; From 7aac4f4921d7416be1ed6ec0e8598ebbe202e404 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 15 Dec 2024 21:33:35 +0800 Subject: [PATCH 4/7] python312Packages.mcdreforged: add updateScript --- pkgs/development/python-modules/mcdreforged/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index c86318481bcf..6fe6d1dafcdd 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -16,6 +16,7 @@ pathspec, pytestCheckHook, versionCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -53,6 +54,8 @@ buildPythonPackage rec { 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"; From 803cf376b1e35cff4708b74a0b0f9cdb9b7069be Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 22 Dec 2024 02:44:32 +0800 Subject: [PATCH 5/7] python312Packages.mcdreforged: 2.14.0 -> 2.14.2 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.14.0...v2.14.2 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.2 --- pkgs/development/python-modules/mcdreforged/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 6fe6d1dafcdd..47616ee254e8 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.14.0"; + version = "2.14.2"; pyproject = true; src = fetchFromGitHub { From 8b88add8485c983865c2cc88988117dbe6554d85 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 4 Jan 2025 15:32:30 +0800 Subject: [PATCH 6/7] python312Packages.mcdreforged: 2.14.2 -> 2.14.3 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.14.2...v2.14.3 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.3 --- pkgs/development/python-modules/mcdreforged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 47616ee254e8..1bafab17641b 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.14.2"; + version = "2.14.3"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; tag = "v${version}"; - hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; + hash = "sha256-sNpQIG41YxzXvEkckabYevAYrlCcdN9wS5tanKq8VPs="; }; build-system = [ setuptools ]; From ce39a776aa92d7d2556926bb3696e011efb80cf6 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 16 Jan 2025 00:58:51 +0800 Subject: [PATCH 7/7] python312Packages.mcdreforged: 2.14.3 -> 2.14.4 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.14.3...v2.14.4 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.4 --- pkgs/development/python-modules/mcdreforged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 1bafab17641b..5797bd47e7f7 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.14.3"; + version = "2.14.4"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; tag = "v${version}"; - hash = "sha256-sNpQIG41YxzXvEkckabYevAYrlCcdN9wS5tanKq8VPs="; + hash = "sha256-R9zM86ohABEaxj7NYj8FCPIYsMDJp0sKjOhWzit69B8="; }; build-system = [ setuptools ];