From 9df9e47f5ea8471dde0a6fb76279e4007ccb3662 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 9 Oct 2025 13:43:58 -0300
Subject: [PATCH 1/2] amoeba-data: move to by-name, modernize

---
 .../am/amoeba-data/package.nix}                  | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename pkgs/{games/amoeba/data.nix => by-name/am/amoeba-data/package.nix} (59%)

diff --git a/pkgs/games/amoeba/data.nix b/pkgs/by-name/am/amoeba-data/package.nix
similarity index 59%
rename from pkgs/games/amoeba/data.nix
rename to pkgs/by-name/am/amoeba-data/package.nix
index fcffe73b1d62..2803d8d46728 100644
--- a/pkgs/games/amoeba/data.nix
+++ b/pkgs/by-name/am/amoeba-data/package.nix
@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "amoeba-data";
   version = "1.1";
 
   src = fetchurl {
-    url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz";
-    sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg";
+    url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${finalAttrs.version}.orig.tar.gz";
+    hash = "sha256-b0kwUVC5U1/aygGvpCgD1SLy+i/1c5vkIsEOs0Om7K0=";
   };
 
   installPhase = ''
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     cp demo.dat $out/share/amoeba/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
     homepage = "https://packages.qa.debian.org/a/amoeba-data.html";
-    license = licenses.unfree;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.all;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dezgeg ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a1c7a5c4ce0..a835acbcc8ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13298,7 +13298,6 @@ with pkgs;
   qgo = libsForQt5.callPackage ../games/qgo { };
 
   amoeba = callPackage ../games/amoeba { };
-  amoeba-data = callPackage ../games/amoeba/data.nix { };
 
   anki = callPackage ../games/anki {
     protobuf = protobuf_31;

From c17f026ad77a9b62ddb581289c1d95155172cb7d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 9 Oct 2025 13:50:44 -0300
Subject: [PATCH 2/2] amoeba: move to by-name, modernize

---
 .../am}/amoeba/include-string-h.patch            |  0
 .../am/amoeba/package.nix}                       | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  2 --
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{games => by-name/am}/amoeba/include-string-h.patch (100%)
 rename pkgs/{games/amoeba/default.nix => by-name/am/amoeba/package.nix} (80%)

diff --git a/pkgs/games/amoeba/include-string-h.patch b/pkgs/by-name/am/amoeba/include-string-h.patch
similarity index 100%
rename from pkgs/games/amoeba/include-string-h.patch
rename to pkgs/by-name/am/amoeba/include-string-h.patch
diff --git a/pkgs/games/amoeba/default.nix b/pkgs/by-name/am/amoeba/package.nix
similarity index 80%
rename from pkgs/games/amoeba/default.nix
rename to pkgs/by-name/am/amoeba/package.nix
index 274e91ba33dc..3b77d67bda29 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/pkgs/by-name/am/amoeba/package.nix
@@ -14,18 +14,18 @@
   installShellFiles,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "amoeba";
   version = "1.1";
   debver = "31";
 
   srcs = [
     (fetchurl {
-      url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz";
+      url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${finalAttrs.version}.orig.tar.gz";
       hash = "sha256-NT6oMuAlTcVZEnYjMCF+BD+k3/w7LfWEmj6bkQln3sM=";
     })
     (fetchurl {
-      url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz";
+      url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${finalAttrs.version}-${finalAttrs.debver}.debian.tar.xz";
       hash = "sha256-Ga/YeXbPXjkG/6qd9Z201d14Hlj/Je6DxgzeIQOqrWc=";
     })
   ];
@@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
     installManPage ../debian/amoeba.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast-paced, polished OpenGL demonstration by Excess";
     homepage = "https://packages.qa.debian.org/a/amoeba.html";
-    license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
+    maintainers = with lib.maintainers; [ dezgeg ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a835acbcc8ea..fcd3da4fa1f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13297,8 +13297,6 @@ with pkgs;
 
   qgo = libsForQt5.callPackage ../games/qgo { };
 
-  amoeba = callPackage ../games/amoeba { };
-
   anki = callPackage ../games/anki {
     protobuf = protobuf_31;
   };