From 5cb52e21868458115f297228f8edbdc9129373bf Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Sat, 28 Mar 2026 19:43:19 -0700 Subject: [PATCH 1/2] mcdreforged: fix build Co-authored-by: Moraxyc --- pkgs/development/python-modules/mcdreforged/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 30991c13c275..daa168105f7b 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -52,6 +52,8 @@ buildPythonPackage rec { versionCheckHook ]; + pythonRelaxDeps = [ "ruamel.yaml" ]; + passthru.updateScript = nix-update-script { }; meta = { From e01d65753bf7db6f1cd38736ce5f22a90c180916 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Sat, 28 Mar 2026 23:35:05 -0700 Subject: [PATCH 2/2] mcdreforged: cleanup --- .../python-modules/mcdreforged/default.nix | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index daa168105f7b..0187158c128d 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -1,25 +1,25 @@ { - lib, - fetchFromGitHub, buildPythonPackage, - setuptools, + fetchFromGitHub, + lib, + pytestCheckHook, + versionCheckHook, + colorama, colorlog, packaging, parse, + pathspec, prompt-toolkit, psutil, requests, resolvelib, ruamel-yaml, + setuptools, typing-extensions, - pathspec, - pytestCheckHook, - versionCheckHook, - nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mcdreforged"; version = "2.15.7"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-e1JrDh8Zio+TCVCVvH8tBE/tY5ja3Nr3dCQRJwRqYh4="; }; @@ -38,13 +38,13 @@ buildPythonPackage rec { colorlog packaging parse + pathspec prompt-toolkit psutil requests resolvelib ruamel-yaml typing-extensions - pathspec ]; nativeCheckInputs = [ @@ -54,14 +54,22 @@ buildPythonPackage rec { pythonRelaxDeps = [ "ruamel.yaml" ]; - passthru.updateScript = nix-update-script { }; - meta = { - description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; + changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/${finalAttrs.src.tag}"; + longDescription = '' + MCDReforged (abbreviated as MCDR) is a tool which provides the + management ability of the Minecraft server using custom plugin + system. It doesn't need to modify or mod the original Minecraft + server at all. + + From in-game calculator, player high-light, to manipulate + scoreboard, manage structure file and backup / load backup, you + can implement these by using MCDR and related plugins. + ''; + description = "Minecraft server control tool"; 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"; + maintainers = with lib.maintainers; [ moraxyc ]; }; -} +})