From 0128b4c1047fd92616b4495ff52ea4fabad56ce4 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 27 Oct 2025 00:54:00 -0400
Subject: [PATCH] update

---
 flake.lock             | 30 +++++++++++++++---------------
 services/minecraft.nix | 10 ++++++----
 tests/minecraft.nix    | 12 ++++++++----
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7e2e758..6864adf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -319,11 +319,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761309979,
-        "narHash": "sha256-N6gHgA7jwehiVnvNIGyoDJ4UCGadktOdH74vPrtdZo4=",
+        "lastModified": 1761528310,
+        "narHash": "sha256-yUSr9xEJCt5JZjhQyzotu0KmNzykQlbsGe4mnqsR+SU=",
         "owner": "ggml-org",
         "repo": "llama.cpp",
-        "rev": "0bcb40b48c6fc6f17ba9672625e526ab2574344b",
+        "rev": "75cbdd3fce38ea12d50cd19e73a069aa5dbbd5fa",
         "type": "github"
       },
       "original": {
@@ -341,11 +341,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761270771,
-        "narHash": "sha256-/gqQ1x4RCIk0Fsfq6a2489M7El79LJttsV1P7pIZn5o=",
+        "lastModified": 1761530861,
+        "narHash": "sha256-VMhre9pdUAT6TDo0KV1kOjtZywCEoBowKRYSaa7KHP0=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "651d677a7ae913c792629437f77278997770a231",
+        "rev": "c90769ae2c7d46fdadcdb81e09a97137b3b87891",
         "type": "github"
       },
       "original": {
@@ -372,11 +372,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761173472,
-        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
+        "lastModified": 1761468971,
+        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
+        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761201560,
-        "narHash": "sha256-l0IRzcO4DlBPsheig/LIxdNLK7b0dCw+xDz+8smoOzs=",
+        "lastModified": 1761526984,
+        "narHash": "sha256-o63BGWD4HtDEGdhzJwW6Sa7zTB1b3NA35QKM03VtL64=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "bfa539938ff13d48aad3da1bece8d0b47ed5bb77",
+        "rev": "109abf3c735c3cde590f22c484e28a71cca8b27c",
         "type": "github"
       },
       "original": {
@@ -548,11 +548,11 @@
     "trackerlist": {
       "flake": false,
       "locked": {
-        "lastModified": 1761257439,
-        "narHash": "sha256-SrprqjKqKFiOiZKIw74nlFx4srZlBe5ehrTNHZXXxnc=",
+        "lastModified": 1761520240,
+        "narHash": "sha256-3zsEtl77eQD61/7s9zJ9K3AuY7YQ7q41R4jK43ZZ8Ao=",
         "owner": "ngosang",
         "repo": "trackerslist",
-        "rev": "2e2b8b6655c7f28b9caf3a52802273127b9264ec",
+        "rev": "5de358f0163906c3d7e542f0406473defb349d09",
         "type": "github"
       },
       "original": {
diff --git a/services/minecraft.nix b/services/minecraft.nix
index 0e48b09..cd9cd85 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -101,10 +101,12 @@
               sha512 = "4dcd7228d1890ddfc78c99ff284b45f9cf40aae77ef6359308e26d06fa0d938365255696af4cc12d524c46c4886cdcd19268c165a2bf0a2835202fe857da5cab";
             };
 
-            better-fabric-console = fetchurl {
-              url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/fZprQjU4/better-fabric-console-mc1.21.10-1.2.7.jar";
-              sha512 = "0321e4a687ba5ed4dcb081aa48909d45c4e153f8b6217cd807f280f33250151b97ac80a122a83d48535c788d3c1e08a7ee882da3b20cf06021e03c1ddc943278";
-            };
+            /*
+              better-fabric-console = fetchurl {
+                url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/fZprQjU4/better-fabric-console-mc1.21.10-1.2.7.jar";
+                sha512 = "0321e4a687ba5ed4dcb081aa48909d45c4e153f8b6217cd807f280f33250151b97ac80a122a83d48535c788d3c1e08a7ee882da3b20cf06021e03c1ddc943278";
+              };
+            */
 
             disconnect-packet-fix = fetchurl {
               url = "https://cdn.modrinth.com/data/rd9rKuJT/versions/Gv74xveQ/disconnect-packet-fix-fabric-2.0.0.jar";
diff --git a/tests/minecraft.nix b/tests/minecraft.nix
index cc0285f..b80913e 100644
--- a/tests/minecraft.nix
+++ b/tests/minecraft.nix
@@ -90,9 +90,13 @@ testPkgs.testers.runNixOSTest {
 
     # Wait up to 60 seconds for the server to complete startup
     with machine.nested("Waiting for minecraft server startup completion"):
-        machine.wait_until_succeeds(
-            "grep -Eq '\\[[0-9]+:[0-9]+:[0-9]+\\] \\[Server thread/INFO\\]: Done \\([0-9]+\\.[0-9]+s\\)! For help, type \"help\"' /var/lib/minecraft/main/logs/latest.log",
-            timeout=60
-        )
+        try:
+            machine.wait_until_succeeds(
+                "grep -Eq '\\[[0-9]+:[0-9]+:[0-9]+\\] \\[Server thread/INFO\\]: Done \\([0-9]+\\.[0-9]+s\\)! For help, type \"help\"' /var/lib/minecraft/main/logs/latest.log",
+                timeout=60
+            )
+        except Exception:
+            print(machine.succeed("cat /var/lib/minecraft/main/logs/latest.log"))
+            raise
   '';
 }