crossfire-*: move to pkgs/by-name/

This covers the server, maps, arch, and client packages. It also gets rid of the
whole hashes-and-versions-in-a-separate-file thing which made sense when I first
wrote it but is kind of clunky now.

authored by

Rebecca Kelly and committed by
Rebecca Kelly
80956ee6 4bf4ae1b

+24 -71
-13
pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
··· 1 - diff --git a/include/Treasures.h b/include/Treasures.h 2 - index 614078f..a00b4f6 100644 3 - --- a/include/Treasures.h 4 - +++ b/include/Treasures.h 5 - @@ -13,6 +13,8 @@ 6 - #ifndef TREASURES_H 7 - #define TREASURES_H 8 - 9 - +#include <cstdint> 10 - + 11 - #include "AssetsCollection.h" 12 - 13 - extern "C" {
+7 -5
pkgs/games/crossfire/crossfire-arch.nix pkgs/by-name/cr/crossfire-arch/package.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchgit, 5 - version, 6 - rev, 7 - hash, 8 5 }: 9 6 10 7 stdenv.mkDerivation { 11 8 pname = "crossfire-arch"; 12 - version = rev; 9 + version = "2025-04"; 13 10 14 11 src = fetchgit { 15 12 url = "https://git.code.sf.net/p/crossfire/crossfire-arch"; 16 - inherit hash rev; 13 + rev = "876eb50b9199e9aa06175b7a7d85832662be3f78"; 14 + hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0="; 17 15 }; 18 16 19 17 installPhase = '' 18 + runHook preInstall 19 + 20 20 mkdir -p "$out" 21 21 cp -a . "$out/" 22 + 23 + runHook postInstall 22 24 ''; 23 25 24 26 meta = with lib; {
+3 -5
pkgs/games/crossfire/crossfire-client.nix pkgs/by-name/cr/crossfire-client/package.nix
··· 22 22 SDL2_mixer, 23 23 libselinux, 24 24 libsepol, 25 - version, 26 - rev, 27 - hash, 28 25 }: 29 26 30 27 stdenv.mkDerivation { 31 28 pname = "crossfire-client"; 32 - version = rev; 29 + version = "2025-01"; 33 30 34 31 src = fetchgit { 35 32 url = "https://git.code.sf.net/p/crossfire/crossfire-client"; 36 - inherit hash rev; 33 + hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0="; 34 + rev = "c69f578add358c1db567f6b46f532dd038d2ade0"; 37 35 }; 38 36 39 37 nativeBuildInputs = [
+7 -5
pkgs/games/crossfire/crossfire-maps.nix pkgs/by-name/cr/crossfire-maps/package.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchgit, 5 - version, 6 - rev, 7 - hash, 8 5 }: 9 6 10 7 stdenv.mkDerivation { 11 8 pname = "crossfire-maps"; 12 - version = rev; 9 + version = "2025-04"; 13 10 14 11 src = fetchgit { 15 12 url = "https://git.code.sf.net/p/crossfire/crossfire-maps"; 16 - inherit hash rev; 13 + rev = "ec57d473064ed1732adb1897415b56f96fbd9382"; 14 + hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE="; 17 15 }; 18 16 19 17 installPhase = '' 18 + runHook preInstall 19 + 20 20 mkdir -p "$out" 21 21 cp -a . "$out/" 22 + 23 + runHook postInstall 22 24 ''; 23 25 24 26 meta = with lib; {
+7 -7
pkgs/games/crossfire/crossfire-server.nix pkgs/by-name/cr/crossfire-server/package.nix
··· 1 1 { 2 2 stdenv, 3 3 lib, 4 + pkgs, 4 5 fetchgit, 5 6 autoconf, 6 7 automake, ··· 10 11 check, 11 12 pkg-config, 12 13 python3, 13 - version, 14 - rev, 15 - hash, 16 - maps, 17 - arch, 14 + # Included here so that hosts using custom maps/archetypes can easily override. 15 + maps ? pkgs.crossfire-maps, 16 + arch ? pkgs.crossfire-arch, 18 17 }: 19 18 20 19 stdenv.mkDerivation { 21 20 pname = "crossfire-server"; 22 - version = rev; 21 + version = "2025-04"; 23 22 24 23 src = fetchgit { 25 24 url = "https://git.code.sf.net/p/crossfire/crossfire-server"; 26 - inherit hash rev; 25 + rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098"; 26 + hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE="; 27 27 }; 28 28 29 29 nativeBuildInputs = [
-29
pkgs/games/crossfire/default.nix
··· 1 - { callPackage, ... }: 2 - 3 - rec { 4 - crossfire-client = callPackage ./crossfire-client.nix { 5 - version = "latest"; 6 - rev = "c69f578add358c1db567f6b46f532dd038d2ade0"; 7 - hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0="; 8 - }; 9 - 10 - crossfire-server = callPackage ./crossfire-server.nix { 11 - version = "latest"; 12 - rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098"; 13 - hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE="; 14 - maps = crossfire-maps; 15 - arch = crossfire-arch; 16 - }; 17 - 18 - crossfire-arch = callPackage ./crossfire-arch.nix { 19 - version = "latest"; 20 - rev = "876eb50b9199e9aa06175b7a7d85832662be3f78"; 21 - hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0="; 22 - }; 23 - 24 - crossfire-maps = callPackage ./crossfire-maps.nix { 25 - version = "latest"; 26 - rev = "ec57d473064ed1732adb1897415b56f96fbd9382"; 27 - hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE="; 28 - }; 29 - }
-7
pkgs/top-level/all-packages.nix
··· 17238 17238 17239 17239 crawl = callPackage ../games/crawl { }; 17240 17240 17241 - inherit (import ../games/crossfire pkgs) 17242 - crossfire-server 17243 - crossfire-arch 17244 - crossfire-maps 17245 - crossfire-client 17246 - ; 17247 - 17248 17241 curseofwar = callPackage ../games/curseofwar { SDL = null; }; 17249 17242 curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; 17250 17243