From a6dde30645aa4a2cd56478842bb0110bb14c33e1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 5 Apr 2026 23:54:06 -0700
Subject: [PATCH] armagetronad: fix build with newer protobuf, update sty,
 allow overrides

---
 pkgs/by-name/ar/armagetronad-dedicated/package.nix | 12 ++++++++----
 pkgs/by-name/ar/armagetronad/package.nix           |  9 +++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ar/armagetronad-dedicated/package.nix b/pkgs/by-name/ar/armagetronad-dedicated/package.nix
index 67aa20cb7210..7444b0319c9c 100644
--- a/pkgs/by-name/ar/armagetronad-dedicated/package.nix
+++ b/pkgs/by-name/ar/armagetronad-dedicated/package.nix
@@ -1,7 +1,11 @@
 {
   armagetronad,
-}:
+  ...
+}@args:
 
-armagetronad.override {
-  dedicatedServer = true;
-}
+armagetronad.override (
+  {
+    dedicatedServer = true;
+  }
+  // args
+)
diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index 1b54395c93b2..2568aedbcc11 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -30,6 +30,7 @@
   gnugrep,
   nixosTests,
   dedicatedServer ? false,
+  ...
 }:
 
 let
@@ -71,8 +72,8 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "3675f21cd5be4932a7a168b321576e0b09e64aaf";
-          hash = "sha256-d2vPFAyx6LhEIxtEUdhrlqqYeCY0NnETlq7TVvX5vVo=";
+          rev = "ec0dbb09ce081be2879acf67bebcd2a2987fd0a4";
+          hash = "sha256-8fH0Q0N2bKCO0t+lOs8EamThpiial2CfEcVP3cZbHX0=";
         in
         dedicatedServer: {
           version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
@@ -104,8 +105,8 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
       "${latestVersionMajor}-sty+ct+ap" =
         let
-          rev = "22fdbee08ca301c09ae4dee7210ccef02536670d";
-          hash = "sha256-F+nnQxI2TTTa+gJYWjQPFjd8tQLCh/dEu/oTV0ie8BI=";
+          rev = "b74df624eae13e919b4b04f9b18043bce9d04431";
+          hash = "sha256-tjEcgyYxaGgHiIH8y9xYM7HEpgZa7DEWIVqK8r0dmaY=";
         in
         dedicatedServer: {
           version = "${latestVersionMajor}-sty+ct+ap-${lib.substring 0 8 rev}";