From 811af9cc92ef042cdcf9d080d21e765a95cb87fc Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 8 Oct 2023 09:30:34 +0200
Subject: [PATCH 1/4] xmage: 1.4.42V6 -> 1.4.50V2

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/games/xmage/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix
index 15a65efeb7bc..1cc1770920e0 100644
--- a/pkgs/games/xmage/default.nix
+++ b/pkgs/games/xmage/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname   = "xmage";
-  version = "1.4.42V6";
+  version = "1.4.50V2";
 
   src = fetchurl {
-    url    = "https://github.com/magefree/mage/releases/download/xmage_1.4.42V6/xmage_${version}.zip";
-    sha256 = "14s4885ldi0rplqmab5m775plsqmmm0m89j402caiqm2q9mzvkhd";
+    url    = "https://github.com/magefree/mage/releases/download/xmage_${version}/xmage_${version}.zip";
+    sha256 = "sha256-t1peHYwCRy3wiIIwOD3nUyoxSOxbw6B/g++A1ofIbmg=";
   };
 
   preferLocalBuild = true;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp -rv ./* $out
 
     cat << EOS > $out/bin/xmage
-exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.42.jar
+exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.50.jar
 EOS
 
     chmod +x $out/bin/xmage

From e28b34eecf0a8161a67498948ebb532327550f28 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 8 Oct 2023 09:31:31 +0200
Subject: [PATCH 2/4] xmage: Convert to use finalAttrs for recursion

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/games/xmage/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix
index 1cc1770920e0..9925938f0cb6 100644
--- a/pkgs/games/xmage/default.nix
+++ b/pkgs/games/xmage/default.nix
@@ -4,12 +4,13 @@
 , unzip
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname   = "xmage";
   version = "1.4.50V2";
 
   src = fetchurl {
-    url    = "https://github.com/magefree/mage/releases/download/xmage_${version}/xmage_${version}.zip";
+    url    =
+    "https://github.com/magefree/mage/releases/download/xmage_${finalAttrs.version}/xmage_${finalAttrs.version}.zip";
     sha256 = "sha256-t1peHYwCRy3wiIIwOD3nUyoxSOxbw6B/g++A1ofIbmg=";
   };
 
@@ -38,5 +39,5 @@ EOS
     homepage = "http://xmage.de/";
   };
 
-}
+})
 

From 9848d3dfc551659f0d7a47ab67ea23312b66b0b2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 8 Oct 2023 09:31:39 +0200
Subject: [PATCH 3/4] xmage: Format expression

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/games/xmage/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix
index 9925938f0cb6..783a9f5ea469 100644
--- a/pkgs/games/xmage/default.nix
+++ b/pkgs/games/xmage/default.nix
@@ -1,16 +1,17 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , jdk8
 , unzip
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname   = "xmage";
+  pname = "xmage";
   version = "1.4.50V2";
 
   src = fetchurl {
-    url    =
-    "https://github.com/magefree/mage/releases/download/xmage_${finalAttrs.version}/xmage_${finalAttrs.version}.zip";
+    url =
+      "https://github.com/magefree/mage/releases/download/xmage_${finalAttrs.version}/xmage_${finalAttrs.version}.zip";
     sha256 = "sha256-t1peHYwCRy3wiIIwOD3nUyoxSOxbw6B/g++A1ofIbmg=";
   };
 
@@ -25,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp -rv ./* $out
 
     cat << EOS > $out/bin/xmage
-exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.50.jar
-EOS
+    exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.50.jar
+    EOS
 
     chmod +x $out/bin/xmage
   '';

From fc21de97f86744ab101995a664370f188a6f58fa Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 8 Oct 2023 09:34:00 +0200
Subject: [PATCH 4/4] xmage: Use substring of version instead of hardcoding jar
 name

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/games/xmage/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix
index 783a9f5ea469..b6aa8e22afd2 100644
--- a/pkgs/games/xmage/default.nix
+++ b/pkgs/games/xmage/default.nix
@@ -21,12 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
     ${unzip}/bin/unzip $src
   '';
 
-  installPhase = ''
+  installPhase = let
+    strVersion = lib.substring 0 6 finalAttrs.version;
+  in ''
     mkdir -p $out/bin
     cp -rv ./* $out
 
     cat << EOS > $out/bin/xmage
-    exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.50.jar
+    exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-${strVersion}.jar
     EOS
 
     chmod +x $out/bin/xmage