From 050b8ae0cc930913aef83288b847d3cdae3dd1a3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 10 Nov 2025 18:55:51 +0000 Subject: [PATCH] liquidwar: migrate to by-name --- .../default.nix => by-name/li/liquidwar/package.nix} | 4 ++-- .../liquidwar/5.nix => by-name/li/liquidwar5/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) rename pkgs/{games/liquidwar/default.nix => by-name/li/liquidwar/package.nix} (98%) rename pkgs/{games/liquidwar/5.nix => by-name/li/liquidwar5/package.nix} (100%) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/by-name/li/liquidwar/package.nix similarity index 98% rename from pkgs/games/liquidwar/default.nix rename to pkgs/by-name/li/liquidwar/package.nix index 0ac6905c9f34..05f7349bf995 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/by-name/li/liquidwar/package.nix @@ -11,7 +11,7 @@ expat, gettext, perl, - guile, + guile_2_0, SDL, SDL_image, SDL_mixer, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { xorgproto libX11 gmp - guile + guile_2_0 libjpeg libpng expat diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/by-name/li/liquidwar5/package.nix similarity index 100% rename from pkgs/games/liquidwar/5.nix rename to pkgs/by-name/li/liquidwar5/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e641a167e423..813a81211a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12682,12 +12682,6 @@ with pkgs; pythonSupport = true; }; - liquidwar = callPackage ../games/liquidwar { - guile = guile_2_0; - }; - - liquidwar5 = callPackage ../games/liquidwar/5.nix { }; - mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix { enableWayland = true; };