From 36c03b6a2db76eed82a774e06727fc37660e8dfd Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 22 Oct 2025 15:11:16 -0700 Subject: [PATCH] blightmud: modernize, move to by-name/ --- .../bl/blightmud/package.nix} | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) rename pkgs/{games/blightmud/default.nix => by-name/bl/blightmud/package.nix} (89%) diff --git a/pkgs/games/blightmud/default.nix b/pkgs/by-name/bl/blightmud/package.nix similarity index 89% rename from pkgs/games/blightmud/default.nix rename to pkgs/by-name/bl/blightmud/package.nix index 23595aa070c2..aa9341e472c3 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/by-name/bl/blightmud/package.nix @@ -9,14 +9,14 @@ withTTS ? false, speechd-minimal, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "blightmud"; version = "5.3.1"; src = fetchFromGitHub { owner = "blightmud"; repo = "blightmud"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk="; }; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { in builtins.concatStringsSep " " (map skipFlag skipList); - meta = with lib; { + meta = { description = "Terminal MUD client written in Rust"; mainProgram = "blightmud"; longDescription = '' @@ -72,8 +72,8 @@ rustPlatform.buildRustPackage rec { friendly mode. ''; homepage = "https://github.com/Blightmud/Blightmud"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ cpu ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ cpu ]; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f170b716b22e..9e2ff27b154b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13263,9 +13263,7 @@ with pkgs; lua = lua5_1; }; - blightmud = callPackage ../games/blightmud { }; - - blightmud-tts = callPackage ../games/blightmud { withTTS = true; }; + blightmud-tts = callPackage ../by-name/bl/blightmud/package.nix { withTTS = true; }; run-npush = callPackage ../by-name/np/npush/run.nix { };