From 8124a94557dc7d13608cdef3d5cdfb47d8b5f2c8 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Fri, 18 Apr 2025 13:35:35 -0400
Subject: [PATCH] crossfire-server: r22111 -> git@2025-04-16

This updates the server, maps, and archetypes in lockstep, since changes to the
server means it needs updated data files and changes to the data need the new
server to load them.

It also updates the build configuration to use the new git repo, and drops the
no longer needed cstdint patch.
---
 pkgs/games/crossfire/crossfire-arch.nix   | 11 +++++------
 pkgs/games/crossfire/crossfire-maps.nix   | 11 +++++------
 pkgs/games/crossfire/crossfire-server.nix | 16 +++++-----------
 pkgs/games/crossfire/default.nix          | 12 ++++++------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/games/crossfire/crossfire-arch.nix
index 0d3b3c0e6ed2..5b46a61ad61c 100644
--- a/pkgs/games/crossfire/crossfire-arch.nix
+++ b/pkgs/games/crossfire/crossfire-arch.nix
@@ -1,20 +1,19 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   version,
   rev,
-  sha256,
+  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-arch";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/arch/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-arch";
+    inherit hash rev;
   };
 
   installPhase = ''
diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/games/crossfire/crossfire-maps.nix
index 32f2330b23b8..3bbdb2945167 100644
--- a/pkgs/games/crossfire/crossfire-maps.nix
+++ b/pkgs/games/crossfire/crossfire-maps.nix
@@ -1,20 +1,19 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   version,
   rev,
-  sha256,
+  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-maps";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/maps/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-maps";
+    inherit hash rev;
   };
 
   installPhase = ''
diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix
index 435d87beb547..8e2368d97d77 100644
--- a/pkgs/games/crossfire/crossfire-server.nix
+++ b/pkgs/games/crossfire/crossfire-server.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   autoconf,
   automake,
   libtool,
@@ -12,7 +12,7 @@
   python3,
   version,
   rev,
-  sha256,
+  hash,
   maps,
   arch,
 }:
@@ -21,16 +21,11 @@ stdenv.mkDerivation {
   pname = "crossfire-server";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/server/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-server";
+    inherit hash rev;
   };
 
-  patches = [
-    ./add-cstdint-include-to-crossfire-server.patch
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake
@@ -56,7 +51,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    broken = true; # cfpython.c:63:10: fatal error: node.h: No such file or directory
     description = "Server for the Crossfire free MMORPG";
     homepage = "http://crossfire.real-time.com/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix
index f494592d6f0a..6ce42386c036 100644
--- a/pkgs/games/crossfire/default.nix
+++ b/pkgs/games/crossfire/default.nix
@@ -9,21 +9,21 @@ rec {
 
   crossfire-server = callPackage ./crossfire-server.nix {
     version = "latest";
-    rev = "22111";
-    sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7";
+    rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098";
+    hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE=";
     maps = crossfire-maps;
     arch = crossfire-arch;
   };
 
   crossfire-arch = callPackage ./crossfire-arch.nix {
     version = "latest";
-    rev = "22111";
-    sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms";
+    rev = "876eb50b9199e9aa06175b7a7d85832662be3f78";
+    hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0=";
   };
 
   crossfire-maps = callPackage ./crossfire-maps.nix {
     version = "latest";
-    rev = "22111";
-    sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap";
+    rev = "ec57d473064ed1732adb1897415b56f96fbd9382";
+    hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE=";
   };
 }