From d8cf88b06b6c9b1484bf16e2b13075ebe997e7ff Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 9 Oct 2025 16:42:48 -0300
Subject: [PATCH] garden-of-coloured-lights: move to by-name, modernize

---
 .../ga/garden-of-coloured-lights/package.nix} | 19 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 10 deletions(-)
 rename pkgs/{games/garden-of-coloured-lights/default.nix => by-name/ga/garden-of-coloured-lights/package.nix} (72%)

diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix
similarity index 72%
rename from pkgs/games/garden-of-coloured-lights/default.nix
rename to pkgs/by-name/ga/garden-of-coloured-lights/package.nix
index 77e252633532..4ad230655160 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix
@@ -4,10 +4,14 @@
   fetchurl,
   autoconf,
   automake,
-  allegro,
+  allegro4,
 }:
 
-stdenv.mkDerivation rec {
+let
+  allegro = allegro4;
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "garden-of-coloured-lights";
   version = "1.0.9";
 
@@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz";
-    sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s";
+    url = "mirror://sourceforge/garden/${finalAttrs.version}/garden-${finalAttrs.version}.tar.gz";
+    hash = "sha256-2vhzLCKaTMBPRgUUv/G6BRcfqtqeGVdccqUKkU8jUuM=";
   };
 
   # Workaround build failure on -fno-common toolchains:
@@ -33,12 +37,11 @@ stdenv.mkDerivation rec {
   #     `eclass'; eclass.o:src/eclass.c:21: first defined here
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
-  meta = with lib; {
+  meta = {
     description = "Old-school vertical shoot-em-up / bullet hell";
     mainProgram = "garden";
     homepage = "https://sourceforge.net/projects/garden/";
     maintainers = [ ];
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
   };
-
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a1c7a5c4ce0..04dc7a3f3e41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13451,8 +13451,6 @@ with pkgs;
 
   freeciv_gtk = freeciv;
 
-  garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
-
   gl-gsync-demo = callPackage ../games/gl-gsync-demo {
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
   };