From d6d2274149147b83bf9dd26933d5768db15fd4fe Mon Sep 17 00:00:00 2001
From: Mrmaxmeier <Mrmaxmeier@gmail.com>
Date: Fri, 3 Apr 2026 15:32:18 +0200
Subject: [PATCH 1/2] maintainers: add mrmaxmeier

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4432311f920d..919b6e885f41 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18317,6 +18317,11 @@
     githubId = 8165792;
     name = "Mark Karpov";
   };
+  mrmaxmeier = {
+    github = "mrmaxmeier";
+    githubId = 3913977;
+    name = "Mrmaxmeier";
+  };
   mrmebelman = {
     email = "burzakovskij@protonmail.com";
     github = "MrMebelMan";

From 44258b99bd86b357f2377eb264b084047a09976d Mon Sep 17 00:00:00 2001
From: Mrmaxmeier <Mrmaxmeier@gmail.com>
Date: Fri, 3 Apr 2026 01:53:02 +0200
Subject: [PATCH 2/2] bombsquad: 1.7.37 -> 1.7.61

This also fixes the build on aarch64 and changes the updater to skip the
latest (not yet settled, unstable hash) version.
---
 pkgs/by-name/bo/bombsquad/package.nix | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix
index 054f1b11d491..7dc3be15a36a 100644
--- a/pkgs/by-name/bo/bombsquad/package.nix
+++ b/pkgs/by-name/bo/bombsquad/package.nix
@@ -2,12 +2,15 @@
   lib,
   stdenv,
   fetchurl,
-  python312,
+  python313,
   SDL2,
+  cairo,
+  pango,
   libvorbis,
   openal,
   curl,
   gnugrep,
+  gnused,
   libgcc,
   makeBinaryWrapper,
   makeDesktopItem,
@@ -22,11 +25,11 @@ let
     {
       x86_64-linux = {
         name = "BombSquad_Linux_x86_64";
-        hash = "sha256-ICjaNZSCUbslB5pELbI4e+1zXWrZzkCkv69jLRx4dr0=";
+        hash = "sha256-VHhDRzB7sSvb3Ou/Sg+PjTKFDG9sKsXueu2qLNfC06k=";
       };
-      aarch-64-linux = {
+      aarch64-linux = {
         name = "BombSquad_Linux_Arm64";
-        hash = "sha256-/m0SOQbHssk0CqZJPRLK9YKphup3dtMqkbWGzqcF0+g=";
+        hash = "sha256-usrhPOsXkJZk0HCSBIGnc4qdIu2SW7STp6Y/e6RmZlM=";
       };
     }
     .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported.");
@@ -39,10 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bombsquad";
-  version = "1.7.37";
+  # Note: This version trails behind the latest version by one since the latest
+  # version sometimes gets replaced for minor updates. The builds in /old/ are
+  # stable.
+  version = "1.7.61";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20240825230506if_/https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz";
+    url = "https://files.ballistica.net/bombsquad/builds/old/${archive.name}_${finalAttrs.version}.tar.gz";
     inherit (archive) hash;
   };
 
@@ -50,10 +56,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
+    cairo
     libgcc
     libvorbis
     openal
-    python312
+    pango
+    python313
   ];
 
   nativeBuildInputs = [
@@ -98,11 +106,12 @@ stdenv.mkDerivation (finalAttrs: {
       runtimeInputs = [
         curl
         gnugrep
+        gnused
       ];
       text = ''
         curl -sL "https://files.ballistica.net/bombsquad/builds/CHANGELOG.md" \
             | grep -oP '^### \K\d+\.\d+\.\d+' \
-            | head -n 1
+            | sed -n 2p
       '';
     });
   };
@@ -118,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       syedahkam
       coffeeispower
+      mrmaxmeier
     ];
     mainProgram = "bombsquad";
     platforms = lib.platforms.linux;