From 0c503c5e2dd40b719a6f6d1e697d26698e9d6f56 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 2 Mar 2024 21:35:55 -0300
Subject: [PATCH 1/3] galaxis: migrate to by-name

---
 .../galaxis/default.nix => by-name/ga/galaxis/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{games/galaxis/default.nix => by-name/ga/galaxis/package.nix} (100%)

diff --git a/pkgs/games/galaxis/default.nix b/pkgs/by-name/ga/galaxis/package.nix
similarity index 100%
rename from pkgs/games/galaxis/default.nix
rename to pkgs/by-name/ga/galaxis/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7261c85d25bd..b533ad4b3a73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37410,8 +37410,6 @@ with pkgs;
 
   fsg = callPackage ../games/fsg { };
 
-  galaxis = callPackage ../games/galaxis { };
-
   gambit-chess = callPackage ../games/gambit { };
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };

From f36dd24429ad2b07844bd67b05d3c5e739f248f9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 2 Mar 2024 21:29:36 -0300
Subject: [PATCH 2/3] galaxis: refactor

- finalAttrs design pattern
- get sources from gitlab
  - and adapt the expression accordingly
- get rid of global with
- split outputs
- set strictDeps
- custom installPhase
---
 pkgs/by-name/ga/galaxis/package.nix | 66 ++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index a3847e73c8da..d0d0baf0351a 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -1,28 +1,53 @@
-{ lib, stdenv, fetchurl, ncurses, xmlto }:
-
-with lib;
-stdenv.mkDerivation rec {
+{ lib
+, docbook_xsl
+, fetchFromGitLab
+, ncurses
+, stdenv
+, xmlto
+}:
 
+stdenv.mkDerivation (finalAttrs: {
   pname = "galaxis";
   version = "1.10";
 
-  src = fetchurl{
-    url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz";
-    sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r";
+  src = fetchFromGitLab {
+    owner = "esr";
+    repo = "galaxis";
+    rev = finalAttrs.version;
+    hash = "sha256-l49JEFAyiNvQJ1qimXzd5WL5jFHaFsu7RJe8Xfp3uWw=";
   };
 
-  buildInputs = [ ncurses xmlto ];
+  outputs = [ "out" "man" ];
 
-  patchPhase = ''
-    sed -i\
-     -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\
-     -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\
-     -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile
+  nativeBuildInputs = [
+    docbook_xsl
+    xmlto
+  ];
+
+  buildInputs = [
+    ncurses
+  ];
+
+  strictDeps = true;
+
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "galaxis"
+    "galaxis.6"
+  ];
+
+  postPatch = ''
+    sed -i -E '/[[:space:]]*xmlto/ s|xmlto|xmlto --skip-validation|' Makefile
   '';
 
-  dontConfigure = true;
-
-  makeFlags = [ "DESTDIR=$(out)" ];
+  # This is better than sed-patch the Makefile
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin $man/share/man/man6
+    install -Dm755 galaxis -t $out/bin/
+    install -Dm644 galaxis.6 -t $man/share/man/man6
+    runHook postInstall
+  '';
 
   meta = {
     description = "Rescue lifeboats lost in interstellar space";
@@ -40,8 +65,9 @@ stdenv.mkDerivation rec {
       game's simpler deductions.
     '';
     homepage = "http://catb.org/~esr/galaxis/";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    license = with lib.licenses; [ gpl2Plus ];
+    mainProgram = "galaxis";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From a9909db7515dd11e9b101ac59569efd8fbd60159 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 3 Mar 2024 09:39:26 -0300
Subject: [PATCH 3/3] galaxis: 1.10 -> 1.11

Now it uses Asciidoctor!

Co-authored-by: Keto <therealketo@gmail.com>
---
 pkgs/by-name/ga/galaxis/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index d0d0baf0351a..788a7453e20f 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -1,27 +1,25 @@
 { lib
-, docbook_xsl
+, asciidoctor
 , fetchFromGitLab
 , ncurses
 , stdenv
-, xmlto
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "galaxis";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchFromGitLab {
     owner = "esr";
     repo = "galaxis";
     rev = finalAttrs.version;
-    hash = "sha256-l49JEFAyiNvQJ1qimXzd5WL5jFHaFsu7RJe8Xfp3uWw=";
+    hash = "sha256-fSzifGoSdWyFGt99slzAsqCMDoeLbBqQGXujX8QAfGc=";
   };
 
   outputs = [ "out" "man" ];
 
   nativeBuildInputs = [
-    docbook_xsl
-    xmlto
+    asciidoctor
   ];
 
   buildInputs = [