From 9863b117532a91a26044d3d0eeec58473aa9f01a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 7 Nov 2024 06:21:47 +0000
Subject: [PATCH 1/2] wesnoth: 1.18.2 -> 1.18.3

Changes: https://github.com/wesnoth/wesnoth/blob/1.18.3/changelog.md
(cherry picked from commit 68e7b65bf3e0b348ab711e833d8712c6b4ad29f1)
---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 5017216aecc43..92ac3e6b4c08d 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.18.2";
+  version = "1.18.3";
 
   src = fetchFromGitHub {
     rev = version;
     owner = "wesnoth";
     repo = "wesnoth";
-    hash = "sha256-nr+WUFzHeaPxCzwc+8JZRL86X8XEsnsGM1HXnNqOIF0=";
+    hash = "sha256-Uk8omtXYZaneyBr4TASRtIKEyJLGwfKWu9vRQNVpdVA=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 9c163546ee0f9fdbc52b88d34aed74d88de5be83 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 3 Jan 2025 14:00:13 +0000
Subject: [PATCH 2/2] Revert "wesnoth: pin to boost183 to restore the build"

No longer required with 1.18.3.

This reverts commit e780bc8e5e3c25ee131dc99c92c119203c2886f7.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dbd8ab633b64..cc85069f3b699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16918,8 +16918,6 @@ with pkgs;
 
   wesnoth = callPackage ../games/wesnoth {
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
-    # fails to build against latest boost
-    boost = boost183;
     # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
     lua = lua5_4.override {
       postConfigure = ''